version 1.1.1.2, 2012/05/29 12:26:49
|
version 1.1.1.3, 2012/10/09 09:29:52
|
Line 18
|
Line 18
|
|
|
#include <sys/types.h> |
#include <sys/types.h> |
#include <sys/param.h> |
#include <sys/param.h> |
|
#include <sys/stat.h> |
|
|
#include <stdio.h> |
#include <stdio.h> |
#ifdef STDC_HEADERS |
#ifdef STDC_HEADERS |
# include <stdlib.h> |
# include <stdlib.h> |
Line 47 extern struct sudo_nss sudo_nss_file;
|
Line 49 extern struct sudo_nss sudo_nss_file;
|
#ifdef HAVE_LDAP |
#ifdef HAVE_LDAP |
extern struct sudo_nss sudo_nss_ldap; |
extern struct sudo_nss sudo_nss_ldap; |
#endif |
#endif |
|
#ifdef HAVE_SSSD |
|
extern struct sudo_nss sudo_nss_sss; |
|
#endif |
|
|
#if defined(HAVE_LDAP) && defined(_PATH_NSSWITCH_CONF) | #if (defined(HAVE_LDAP) || defined(HAVE_SSSD)) && defined(_PATH_NSSWITCH_CONF) |
/* |
/* |
* Read in /etc/nsswitch.conf |
* Read in /etc/nsswitch.conf |
* Returns a tail queue of matches. |
* Returns a tail queue of matches. |
Line 58 sudo_read_nss(void)
|
Line 63 sudo_read_nss(void)
|
{ |
{ |
FILE *fp; |
FILE *fp; |
char *cp; |
char *cp; |
|
#ifdef HAVE_SSSD |
|
bool saw_sss = false; |
|
#endif |
bool saw_files = false; |
bool saw_files = false; |
bool saw_ldap = false; |
bool saw_ldap = false; |
bool got_match = false; |
bool got_match = false; |
Line 84 sudo_read_nss(void)
|
Line 92 sudo_read_nss(void)
|
} else if (strcasecmp(cp, "ldap") == 0 && !saw_ldap) { |
} else if (strcasecmp(cp, "ldap") == 0 && !saw_ldap) { |
tq_append(&snl, &sudo_nss_ldap); |
tq_append(&snl, &sudo_nss_ldap); |
got_match = true; |
got_match = true; |
|
#ifdef HAVE_SSSD |
|
} else if (strcasecmp(cp, "sss") == 0 && !saw_sss) { |
|
tq_append(&snl, &sudo_nss_sss); |
|
got_match = true; |
|
#endif |
} else if (strcasecmp(cp, "[NOTFOUND=return]") == 0 && got_match) { |
} else if (strcasecmp(cp, "[NOTFOUND=return]") == 0 && got_match) { |
/* NOTFOUND affects the most recent entry */ |
/* NOTFOUND affects the most recent entry */ |
tq_last(&snl)->ret_if_notfound = true; |
tq_last(&snl)->ret_if_notfound = true; |
got_match = false; |
got_match = false; |
|
} else if (strcasecmp(cp, "[SUCCESS=return]") == 0 && got_match) { |
|
/* SUCCESS affects the most recent entry */ |
|
tq_last(&snl)->ret_if_found = true; |
|
got_match = false; |
} else |
} else |
got_match = false; |
got_match = false; |
} |
} |
Line 104 nomatch:
|
Line 121 nomatch:
|
debug_return_ptr(&snl); |
debug_return_ptr(&snl); |
} |
} |
|
|
#else /* HAVE_LDAP && _PATH_NSSWITCH_CONF */ | #else /* (HAVE_LDAP || HAVE_SSSD) && _PATH_NSSWITCH_CONF */ |
|
|
# if defined(HAVE_LDAP) && defined(_PATH_NETSVC_CONF) | # if (defined(HAVE_LDAP) || defined(HAVE_SSSD)) && defined(_PATH_NETSVC_CONF) |
|
|
/* |
/* |
* Read in /etc/netsvc.conf (like nsswitch.conf on AIX) |
* Read in /etc/netsvc.conf (like nsswitch.conf on AIX) |
Line 117 sudo_read_nss(void)
|
Line 134 sudo_read_nss(void)
|
{ |
{ |
FILE *fp; |
FILE *fp; |
char *cp, *ep; |
char *cp, *ep; |
|
#ifdef HAVE_SSSD |
|
bool saw_sss = false; |
|
#endif |
bool saw_files = false; |
bool saw_files = false; |
bool saw_ldap = false; |
bool saw_ldap = false; |
bool got_match = false; |
bool got_match = false; |
Line 156 sudo_read_nss(void)
|
Line 176 sudo_read_nss(void)
|
tq_append(&snl, &sudo_nss_ldap); |
tq_append(&snl, &sudo_nss_ldap); |
got_match = true; |
got_match = true; |
ep = &cp[4]; |
ep = &cp[4]; |
|
#ifdef HAVE_SSSD |
|
} else if (!saw_sss && strncasecmp(cp, "sss", 3) == 0 && |
|
(isspace((unsigned char)cp[3]) || cp[3] == '\0')) { |
|
tq_append(&snl, &sudo_nss_sss); |
|
got_match = true; |
|
ep = &cp[3]; |
|
#endif |
} else { |
} else { |
got_match = false; |
got_match = false; |
} |
} |
Line 195 sudo_read_nss(void)
|
Line 222 sudo_read_nss(void)
|
static struct sudo_nss_list snl; |
static struct sudo_nss_list snl; |
debug_decl(sudo_read_nss, SUDO_DEBUG_NSS) |
debug_decl(sudo_read_nss, SUDO_DEBUG_NSS) |
|
|
|
# ifdef HAVE_SSSD |
|
tq_append(&snl, &sudo_nss_sss); |
|
# endif |
# ifdef HAVE_LDAP |
# ifdef HAVE_LDAP |
tq_append(&snl, &sudo_nss_ldap); |
tq_append(&snl, &sudo_nss_ldap); |
# endif |
# endif |
Line 233 display_privs(struct sudo_nss_list *snl, struct passwd
|
Line 263 display_privs(struct sudo_nss_list *snl, struct passwd
|
{ |
{ |
struct sudo_nss *nss; |
struct sudo_nss *nss; |
struct lbuf defs, privs; |
struct lbuf defs, privs; |
int count, olen; | struct stat sb; |
| int cols, count, olen; |
debug_decl(display_privs, SUDO_DEBUG_NSS) |
debug_decl(display_privs, SUDO_DEBUG_NSS) |
|
|
lbuf_init(&defs, output, 4, NULL, sudo_user.cols); | cols = sudo_user.cols; |
lbuf_init(&privs, output, 4, NULL, sudo_user.cols); | if (fstat(STDOUT_FILENO, &sb) == 0 && S_ISFIFO(sb.st_mode)) |
| cols = 0; |
| lbuf_init(&defs, output, 4, NULL, cols); |
| lbuf_init(&privs, output, 4, NULL, cols); |
|
|
/* Display defaults from all sources. */ |
/* Display defaults from all sources. */ |
lbuf_append(&defs, _("Matching Defaults entries for %s on this host:\n"), |
lbuf_append(&defs, _("Matching Defaults entries for %s on this host:\n"), |
Line 272 display_privs(struct sudo_nss_list *snl, struct passwd
|
Line 306 display_privs(struct sudo_nss_list *snl, struct passwd
|
tq_foreach_fwd(snl, nss) { |
tq_foreach_fwd(snl, nss) { |
count += nss->display_privs(nss, pw, &privs); |
count += nss->display_privs(nss, pw, &privs); |
} |
} |
if (count) { | if (count == 0) { |
lbuf_print(&defs); | defs.len = 0; |
lbuf_print(&privs); | privs.len = 0; |
} else { | lbuf_append(&privs, _("User %s is not allowed to run sudo on %s.\n"), |
printf(_("User %s is not allowed to run sudo on %s.\n"), pw->pw_name, | pw->pw_name, user_shost); |
user_shost); | |
} |
} |
|
lbuf_print(&defs); |
|
lbuf_print(&privs); |
|
|
lbuf_destroy(&defs); |
lbuf_destroy(&defs); |
lbuf_destroy(&privs); |
lbuf_destroy(&privs); |