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

[TACACS] Improve nss-tacplus TACACS connect timeout #17460

Merged
merged 8 commits into from
Mar 6, 2024
Merged

[TACACS] Improve nss-tacplus TACACS connect timeout #17460

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8e67c67
Connect all server in parallel
liuh-80 Dec 8, 2023
95dd804
Improve by add a delay
liuh-80 Jan 4, 2024
c602f15
Improve code
liuh-80 Jan 4, 2024
1334163
Improve code
liuh-80 Jan 5, 2024
0b4918c
Improve code
liuh-80 Jan 5, 2024
2954932
Improve timeout
liuh-80 Feb 20, 2024
1635d62
Fix patch file
liuh-80 Feb 20, 2024
56abe27
Improve code by PR comments
liuh-80 Feb 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 {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

else

if tac_srv[tac_srv_no].timeout == 0, do you want to tac_readtimeout_enable or not?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed, when config file has a negative config value, timeout will set to 0 and tac_readtimeout_enable will disabled.

+ 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