--- embedaddon/sudo/plugins/sudoers/parse.c 2012/02/21 16:23:02 1.1.1.1 +++ embedaddon/sudo/plugins/sudoers/parse.c 2012/05/29 12:26:49 1.1.1.2 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004-2005, 2007-2011 Todd C. Miller + * Copyright (c) 2004-2005, 2007-2012 Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -70,7 +70,8 @@ struct sudo_nss sudo_nss_file = { */ extern FILE *yyin; extern char *errorfile; -extern int errorlineno, parse_error; +extern int errorlineno; +extern bool parse_error; /* * Local prototypes. @@ -81,15 +82,19 @@ static int display_bound_defaults(int, struct lbuf *); int sudo_file_open(struct sudo_nss *nss) { + debug_decl(sudo_file_open, SUDO_DEBUG_NSS) + if (def_ignore_local_sudoers) - return -1; - nss->handle = open_sudoers(sudoers_file, FALSE, NULL); - return nss->handle ? 0 : -1; + debug_return_int(-1); + nss->handle = open_sudoers(sudoers_file, false, NULL); + debug_return_int(nss->handle ? 0 : -1); } int sudo_file_close(struct sudo_nss *nss) { + debug_decl(sudo_file_close, SUDO_DEBUG_NSS) + /* Free parser data structures and close sudoers file. */ init_parser(NULL, 0); if (nss->handle != NULL) { @@ -97,7 +102,7 @@ sudo_file_close(struct sudo_nss *nss) nss->handle = NULL; yyin = NULL; } - return 0; + debug_return_int(0); } /* @@ -106,17 +111,23 @@ sudo_file_close(struct sudo_nss *nss) int sudo_file_parse(struct sudo_nss *nss) { + debug_decl(sudo_file_close, SUDO_DEBUG_NSS) + if (nss->handle == NULL) - return -1; + debug_return_int(-1); init_parser(sudoers_file, 0); yyin = nss->handle; if (yyparse() != 0 || parse_error) { - log_error(NO_EXIT, _("parse error in %s near line %d"), - errorfile, errorlineno); - return -1; + if (errorlineno != -1) { + log_error(0, _("parse error in %s near line %d"), + errorfile, errorlineno); + } else { + log_error(0, _("parse error in %s"), errorfile); + } + debug_return_int(-1); } - return 0; + debug_return_int(0); } /* @@ -125,12 +136,14 @@ sudo_file_parse(struct sudo_nss *nss) int sudo_file_setdefs(struct sudo_nss *nss) { + debug_decl(sudo_file_setdefs, SUDO_DEBUG_NSS) + if (nss->handle == NULL) - return -1; + debug_return_int(-1); if (!update_defaults(SETDEF_GENERIC|SETDEF_HOST|SETDEF_USER)) - return -1; - return 0; + debug_return_int(-1); + debug_return_int(0); } /* @@ -145,9 +158,10 @@ sudo_file_lookup(struct sudo_nss *nss, int validated, struct cmndtag *tags = NULL; struct privilege *priv; struct userspec *us; + debug_decl(sudo_file_lookup, SUDO_DEBUG_NSS) if (nss->handle == NULL) - return validated; + debug_return_int(validated); /* * Only check the actual command if pwflag is not set. @@ -159,7 +173,7 @@ sudo_file_lookup(struct sudo_nss *nss, int validated, enum def_tuple pwcheck; pwcheck = (pwflag == -1) ? never : sudo_defs_table[pwflag].sd_un.tuple; - nopass = (pwcheck == all) ? TRUE : FALSE; + nopass = (pwcheck == all) ? true : false; if (list_pw == NULL) SET(validated, FLAG_NO_CHECK); @@ -178,8 +192,8 @@ sudo_file_lookup(struct sudo_nss *nss, int validated, user_uid == list_pw->pw_uid || cmnd_matches(cs->cmnd) == ALLOW) match = ALLOW; - if ((pwcheck == any && cs->tags.nopasswd == TRUE) || - (pwcheck == all && cs->tags.nopasswd != TRUE)) + if ((pwcheck == any && cs->tags.nopasswd == true) || + (pwcheck == all && cs->tags.nopasswd != true)) nopass = cs->tags.nopasswd; } } @@ -191,9 +205,9 @@ sudo_file_lookup(struct sudo_nss *nss, int validated, SET(validated, VALIDATE_NOT_OK); if (pwcheck == always && def_authenticate) SET(validated, FLAG_CHECK_USER); - else if (pwcheck == never || nopass == TRUE) - def_authenticate = FALSE; - return validated; + else if (pwcheck == never || nopass == true) + def_authenticate = false; + debug_return_int(validated); } /* Need to be runas user while stat'ing things. */ @@ -254,7 +268,7 @@ sudo_file_lookup(struct sudo_nss *nss, int validated, def_authenticate = !tags->nopasswd; } restore_perms(); - return validated; + debug_return_int(validated); } #define TAG_CHANGED(t) \ @@ -265,6 +279,7 @@ sudo_file_append_cmnd(struct cmndspec *cs, struct cmnd struct lbuf *lbuf) { struct member *m; + debug_decl(sudo_file_append_cmnd, SUDO_DEBUG_NSS) #ifdef HAVE_SELINUX if (cs->role) @@ -295,6 +310,7 @@ sudo_file_append_cmnd(struct cmndspec *cs, struct cmnd m = cs->cmnd; print_member(lbuf, m->name, m->type, m->negated, CMNDALIAS); + debug_return; } static int @@ -306,6 +322,7 @@ sudo_file_display_priv_short(struct passwd *pw, struct struct privilege *priv; struct cmndtag tags; int nfound = 0; + debug_decl(sudo_file_display_priv_short, SUDO_DEBUG_NSS) tq_foreach_fwd(&us->privileges, priv) { if (hostlist_matches(&priv->hostlist) != ALLOW) @@ -347,7 +364,7 @@ sudo_file_display_priv_short(struct passwd *pw, struct } lbuf_append(lbuf, "\n"); } - return nfound; + debug_return_int(nfound); } static int @@ -359,6 +376,7 @@ sudo_file_display_priv_long(struct passwd *pw, struct struct privilege *priv; struct cmndtag tags; int nfound = 0; + debug_decl(sudo_file_display_priv_long, SUDO_DEBUG_NSS) tq_foreach_fwd(&us->privileges, priv) { if (hostlist_matches(&priv->hostlist) != ALLOW) @@ -400,7 +418,7 @@ sudo_file_display_priv_long(struct passwd *pw, struct nfound++; } } - return nfound; + debug_return_int(nfound); } int @@ -409,6 +427,7 @@ sudo_file_display_privs(struct sudo_nss *nss, struct p { struct userspec *us; int nfound = 0; + debug_decl(sudo_file_display_priv, SUDO_DEBUG_NSS) if (nss->handle == NULL) goto done; @@ -423,7 +442,7 @@ sudo_file_display_privs(struct sudo_nss *nss, struct p nfound += sudo_file_display_priv_short(pw, us, lbuf); } done: - return nfound; + debug_return_int(nfound); } /* @@ -436,6 +455,7 @@ sudo_file_display_defaults(struct sudo_nss *nss, struc struct defaults *d; char *prefix; int nfound = 0; + debug_decl(sudo_file_display_defaults, SUDO_DEBUG_NSS) if (nss->handle == NULL) goto done; @@ -470,12 +490,12 @@ sudo_file_display_defaults(struct sudo_nss *nss, struc lbuf_append_quoted(lbuf, SUDOERS_QUOTED, "%s", d->val); } else lbuf_append(lbuf, "%s%s%s", prefix, - d->op == FALSE ? "!" : "", d->var); + d->op == false ? "!" : "", d->var); prefix = ", "; nfound++; } done: - return nfound; + debug_return_int(nfound); } /* @@ -486,12 +506,13 @@ sudo_file_display_bound_defaults(struct sudo_nss *nss, struct lbuf *lbuf) { int nfound = 0; + debug_decl(sudo_file_display_bound_defaults, SUDO_DEBUG_NSS) /* XXX - should only print ones that match what the user can do. */ nfound += display_bound_defaults(DEFAULTS_RUNAS, lbuf); nfound += display_bound_defaults(DEFAULTS_CMND, lbuf); - return nfound; + debug_return_int(nfound); } /* @@ -504,6 +525,7 @@ display_bound_defaults(int dtype, struct lbuf *lbuf) struct member *m, *binding = NULL; char *dsep; int atype, nfound = 0; + debug_decl(display_bound_defaults, SUDO_DEBUG_NSS) switch (dtype) { case DEFAULTS_HOST: @@ -523,7 +545,7 @@ display_bound_defaults(int dtype, struct lbuf *lbuf) dsep = "!"; break; default: - return -1; + debug_return_int(-1); } tq_foreach_fwd(&defaults, d) { if (d->type != dtype) @@ -547,10 +569,10 @@ display_bound_defaults(int dtype, struct lbuf *lbuf) lbuf_append(lbuf, "%s%s%s", d->var, d->op == '+' ? "+=" : d->op == '-' ? "-=" : "=", d->val); } else - lbuf_append(lbuf, "%s%s", d->op == FALSE ? "!" : "", d->var); + lbuf_append(lbuf, "%s%s", d->op == false ? "!" : "", d->var); } - return nfound; + debug_return_int(nfound); } int @@ -562,6 +584,7 @@ sudo_file_display_cmnd(struct sudo_nss *nss, struct pa struct userspec *us; int rval = 1; int host_match, runas_match, cmnd_match; + debug_decl(sudo_file_display_cmnd, SUDO_DEBUG_NSS) if (nss->handle == NULL) goto done; @@ -595,7 +618,7 @@ sudo_file_display_cmnd(struct sudo_nss *nss, struct pa rval = 0; } done: - return rval; + debug_return_int(rval); } /* @@ -608,6 +631,7 @@ _print_member(struct lbuf *lbuf, char *name, int type, struct alias *a; struct member *m; struct sudo_command *c; + debug_decl(_print_member, SUDO_DEBUG_NSS) switch (type) { case ALL: @@ -638,6 +662,7 @@ _print_member(struct lbuf *lbuf, char *name, int type, lbuf_append(lbuf, "%s%s", negated ? "!" : "", name); break; } + debug_return; } static void