Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[code sync] Merge code from sonic-net/sonic-buildimage:202305 to 202305 #441

Merged
merged 2 commits into from
Aug 28, 2024
Merged

[code sync] Merge code from sonic-net/sonic-buildimage:202305 to 202305 #441

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0928744
[TACACS] Improve nss-tacplus TACACS connect timeout (#17460)
liuh-80 Mar 6, 2024
f5f4cbb
Merge branch '202305' of https://github.com/sonic-net/sonic-buildimag…
mssonicbld Aug 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions src/tacacs/nss/patch/0001-Modify-user-map-profile.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ index 79e62b9..ecfa0b0 100644

/*
* pwbuf is used to reduce number of arguments passed around; the strings in
@@ -63,255 +59,239 @@ struct pwbuf {
@@ -63,255 +59,245 @@ struct pwbuf {
typedef struct {
struct addrinfo *addr;
char *key;
Expand Down Expand Up @@ -445,9 +445,15 @@ index 79e62b9..ecfa0b0 100644
+ tac_srv[tac_srv_no].key = strdup(token + 7);
+ }
+ else if(!strncmp(token, "timeout=", 8)) {
+ tac_srv[tac_srv_no].timeout = (int)strtoul(token + 8, NULL, 0);
+ if(tac_srv[tac_srv_no].timeout < 0)
+ tac_srv[tac_srv_no].timeout = 0;
+ int timeout = (int)strtoul(token + 8, NULL, 0);
+ if(timeout < 0) {
+ tac_srv[tac_srv_no].timeout = 0;
+ tac_readtimeout_enable = 0;
+ }
+ else {
+ tac_srv[tac_srv_no].timeout = timeout;
+ tac_readtimeout_enable = 1;
+ }
+ /* Limit timeout to make sure upper application not wait
+ * for a long time*/
+ if(tac_srv[tac_srv_no].timeout > 5)
Expand Down
Loading