/[smeserver]/rpms/sudo/sme9/sudo-1.8.6p3-nssdupfix.patch
ViewVC logotype

Annotation of /rpms/sudo/sme9/sudo-1.8.6p3-nssdupfix.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph


Revision 1.1 - (hide annotations) (download)
Thu Feb 4 19:44:28 2021 UTC (3 years, 8 months ago) by jpp
Branch: MAIN
CVS Tags: sudo-1_8_6p3-30_el6_sme, sudo-1_8_6p3-29_el6_9, HEAD
Sudo

1 jpp 1.1 diff -up sudo-1.8.6p3/plugins/sudoers/sudo_nss.c.nssdupfix sudo-1.8.6p3/plugins/sudoers/sudo_nss.c
2     --- sudo-1.8.6p3/plugins/sudoers/sudo_nss.c.nssdupfix 2015-02-27 11:30:35.666426719 +0100
3     +++ sudo-1.8.6p3/plugins/sudoers/sudo_nss.c 2015-02-27 11:33:50.726600481 +0100
4     @@ -88,14 +88,14 @@ sudo_read_nss(void)
5     for ((cp = strtok(cp + 8, " \t")); cp != NULL; (cp = strtok(NULL, " \t"))) {
6     if (strcasecmp(cp, "files") == 0 && !saw_files) {
7     tq_append(&snl, &sudo_nss_file);
8     - got_match = true;
9     + got_match = saw_files = true;
10     } else if (strcasecmp(cp, "ldap") == 0 && !saw_ldap) {
11     tq_append(&snl, &sudo_nss_ldap);
12     - got_match = true;
13     + got_match = saw_ldap = true;
14     #ifdef HAVE_SSSD
15     } else if (strcasecmp(cp, "sss") == 0 && !saw_sss) {
16     tq_append(&snl, &sudo_nss_sss);
17     - got_match = true;
18     + got_match = saw_sss = true;
19     #endif
20     } else if (strcasecmp(cp, "[NOTFOUND=return]") == 0 && got_match) {
21     /* NOTFOUND affects the most recent entry */
22     @@ -169,18 +169,18 @@ sudo_read_nss(void)
23     if (!saw_files && strncasecmp(cp, "files", 5) == 0 &&
24     (isspace((unsigned char)cp[5]) || cp[5] == '\0')) {
25     tq_append(&snl, &sudo_nss_file);
26     - got_match = true;
27     + got_match = saw_files = true;
28     ep = &cp[5];
29     } else if (!saw_ldap && strncasecmp(cp, "ldap", 4) == 0 &&
30     (isspace((unsigned char)cp[4]) || cp[4] == '\0')) {
31     tq_append(&snl, &sudo_nss_ldap);
32     - got_match = true;
33     + got_match = saw_ldap = true;
34     ep = &cp[4];
35     #ifdef HAVE_SSSD
36     } else if (!saw_sss && strncasecmp(cp, "sss", 3) == 0 &&
37     (isspace((unsigned char)cp[3]) || cp[3] == '\0')) {
38     tq_append(&snl, &sudo_nss_sss);
39     - got_match = true;
40     + got_match = saw_sss = true;
41     ep = &cp[3];
42     #endif
43     } else {

admin@koozali.org
ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed