--- embedaddon/sudo/plugins/sudoers/defaults.c 2013/10/14 07:56:34 1.1.1.5 +++ embedaddon/sudo/plugins/sudoers/defaults.c 2014/06/15 16:12:54 1.1.1.6 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999-2005, 2007-2013 + * Copyright (c) 1999-2005, 2007-2014 * Todd C. Miller * * Permission to use, copy, modify, and distribute this software for any @@ -148,11 +148,14 @@ dump_defaults(void) sudo_printf(SUDO_CONV_INFO_MSG, "\n"); } break; - case T_UINT: case T_INT: sudo_printf(SUDO_CONV_INFO_MSG, desc, cur->sd_un.ival); sudo_printf(SUDO_CONV_INFO_MSG, "\n"); break; + case T_UINT: + sudo_printf(SUDO_CONV_INFO_MSG, desc, cur->sd_un.uival); + sudo_printf(SUDO_CONV_INFO_MSG, "\n"); + break; case T_FLOAT: sudo_printf(SUDO_CONV_INFO_MSG, desc, cur->sd_un.fval); sudo_printf(SUDO_CONV_INFO_MSG, "\n"); @@ -162,9 +165,9 @@ dump_defaults(void) sudo_printf(SUDO_CONV_INFO_MSG, "\n"); break; case T_LIST: - if (cur->sd_un.list) { + if (!SLIST_EMPTY(&cur->sd_un.list)) { sudo_printf(SUDO_CONV_INFO_MSG, "%s\n", desc); - for (item = cur->sd_un.list; item; item = item->next) { + SLIST_FOREACH(item, &cur->sd_un.list, entries) { sudo_printf(SUDO_CONV_INFO_MSG, "\t%s\n", item->value); } @@ -172,7 +175,7 @@ dump_defaults(void) break; case T_TUPLE: for (def = cur->values; def->sval; def++) { - if (cur->sd_un.ival == def->ival) { + if (cur->sd_un.tuple == def->nval) { sudo_printf(SUDO_CONV_INFO_MSG, desc, def->sval); break; } @@ -204,7 +207,7 @@ set_default(char *var, char *val, int op) break; } if (!cur->name) { - warningx(_("unknown defaults entry `%s'"), var); + warningx(U_("unknown defaults entry `%s'"), var); debug_return_bool(false); } @@ -212,20 +215,20 @@ set_default(char *var, char *val, int op) case T_LOGFAC: if (!store_syslogfac(val, cur, op)) { if (val) - warningx(_("value `%s' is invalid for option `%s'"), + warningx(U_("value `%s' is invalid for option `%s'"), val, var); else - warningx(_("no value specified for `%s'"), var); + warningx(U_("no value specified for `%s'"), var); debug_return_bool(false); } break; case T_LOGPRI: if (!store_syslogpri(val, cur, op)) { if (val) - warningx(_("value `%s' is invalid for option `%s'"), + warningx(U_("value `%s' is invalid for option `%s'"), val, var); else - warningx(_("no value specified for `%s'"), var); + warningx(U_("no value specified for `%s'"), var); debug_return_bool(false); } break; @@ -233,16 +236,16 @@ set_default(char *var, char *val, int op) if (!val) { /* Check for bogus boolean usage or lack of a value. */ if (!ISSET(cur->type, T_BOOL) || op != false) { - warningx(_("no value specified for `%s'"), var); + warningx(U_("no value specified for `%s'"), var); debug_return_bool(false); } } if (ISSET(cur->type, T_PATH) && val && *val != '/') { - warningx(_("values for `%s' must start with a '/'"), var); + warningx(U_("values for `%s' must start with a '/'"), var); debug_return_bool(false); } if (!store_str(val, cur, op)) { - warningx(_("value `%s' is invalid for option `%s'"), val, var); + warningx(U_("value `%s' is invalid for option `%s'"), val, var); debug_return_bool(false); } break; @@ -250,12 +253,12 @@ set_default(char *var, char *val, int op) if (!val) { /* Check for bogus boolean usage or lack of a value. */ if (!ISSET(cur->type, T_BOOL) || op != false) { - warningx(_("no value specified for `%s'"), var); + warningx(U_("no value specified for `%s'"), var); debug_return_bool(false); } } if (!store_int(val, cur, op)) { - warningx(_("value `%s' is invalid for option `%s'"), val, var); + warningx(U_("value `%s' is invalid for option `%s'"), val, var); debug_return_bool(false); } break; @@ -263,12 +266,12 @@ set_default(char *var, char *val, int op) if (!val) { /* Check for bogus boolean usage or lack of a value. */ if (!ISSET(cur->type, T_BOOL) || op != false) { - warningx(_("no value specified for `%s'"), var); + warningx(U_("no value specified for `%s'"), var); debug_return_bool(false); } } if (!store_uint(val, cur, op)) { - warningx(_("value `%s' is invalid for option `%s'"), val, var); + warningx(U_("value `%s' is invalid for option `%s'"), val, var); debug_return_bool(false); } break; @@ -276,12 +279,12 @@ set_default(char *var, char *val, int op) if (!val) { /* Check for bogus boolean usage or lack of a value. */ if (!ISSET(cur->type, T_BOOL) || op != false) { - warningx(_("no value specified for `%s'"), var); + warningx(U_("no value specified for `%s'"), var); debug_return_bool(false); } } if (!store_float(val, cur, op)) { - warningx(_("value `%s' is invalid for option `%s'"), val, var); + warningx(U_("value `%s' is invalid for option `%s'"), val, var); debug_return_bool(false); } break; @@ -289,18 +292,18 @@ set_default(char *var, char *val, int op) if (!val) { /* Check for bogus boolean usage or lack of a value. */ if (!ISSET(cur->type, T_BOOL) || op != false) { - warningx(_("no value specified for `%s'"), var); + warningx(U_("no value specified for `%s'"), var); debug_return_bool(false); } } if (!store_mode(val, cur, op)) { - warningx(_("value `%s' is invalid for option `%s'"), val, var); + warningx(U_("value `%s' is invalid for option `%s'"), val, var); debug_return_bool(false); } break; case T_FLAG: if (val) { - warningx(_("option `%s' does not take a value"), var); + warningx(U_("option `%s' does not take a value"), var); debug_return_bool(false); } cur->sd_un.flag = op; @@ -309,22 +312,22 @@ set_default(char *var, char *val, int op) if (!val) { /* Check for bogus boolean usage or lack of a value. */ if (!ISSET(cur->type, T_BOOL) || op != false) { - warningx(_("no value specified for `%s'"), var); + warningx(U_("no value specified for `%s'"), var); debug_return_bool(false); } } if (!store_list(val, cur, op)) { - warningx(_("value `%s' is invalid for option `%s'"), val, var); + warningx(U_("value `%s' is invalid for option `%s'"), val, var); debug_return_bool(false); } break; case T_TUPLE: if (!val && !ISSET(cur->type, T_BOOL)) { - warningx(_("no value specified for `%s'"), var); + warningx(U_("no value specified for `%s'"), var); debug_return_bool(false); } if (!store_tuple(val, cur, op)) { - warningx(_("value `%s' is invalid for option `%s'"), val, var); + warningx(U_("value `%s' is invalid for option `%s'"), val, var); debug_return_bool(false); } break; @@ -432,6 +435,9 @@ init_defaults(void) #else def_pam_session = true; #endif +#ifdef HAVE_INNETGR + def_use_netgroups = true; +#endif /* Syslog options need special care since they both strings and ints */ #if (LOGGING & SLOG_SYSLOG) @@ -464,6 +470,7 @@ init_defaults(void) def_mailto = estrdup(MAILTO); def_mailsub = estrdup(N_(MAILSUBJECT)); def_badpass_message = estrdup(_(INCORRECT_PASSWORD)); + def_lecture_status_dir = estrdup(_PATH_SUDO_LECTURE_DIR); def_timestampdir = estrdup(_PATH_SUDO_TIMEDIR); def_passprompt = estrdup(_(PASSPROMPT)); def_runas_default = estrdup(RUNAS_DEFAULT); @@ -482,6 +489,7 @@ init_defaults(void) #endif def_editor = estrdup(EDITOR); def_set_utmp = true; + def_pam_setcred = true; /* Finally do the lists (currently just environment tables). */ init_envtables(); @@ -502,7 +510,7 @@ update_defaults(int what) bool rc = true; debug_decl(update_defaults, SUDO_DEBUG_DEFAULTS) - tq_foreach_fwd(&defaults, def) { + TAILQ_FOREACH(def, &defaults, entries) { switch (def->type) { case DEFAULTS: if (ISSET(what, SETDEF_GENERIC) && @@ -513,7 +521,7 @@ update_defaults(int what) #if 1 if (ISSET(what, SETDEF_USER)) { int m; - m = userlist_matches(sudo_user.pw, &def->binding); + m = userlist_matches(sudo_user.pw, def->binding); if (m == ALLOW) { if (!set_default(def->var, def->val, def->op)) rc = false; @@ -521,26 +529,26 @@ update_defaults(int what) } #else if (ISSET(what, SETDEF_USER) && - userlist_matches(sudo_user.pw, &def->binding) == ALLOW && + userlist_matches(sudo_user.pw, def->binding) == ALLOW && !set_default(def->var, def->val, def->op)) rc = false; #endif break; case DEFAULTS_RUNAS: if (ISSET(what, SETDEF_RUNAS) && - runaslist_matches(&def->binding, NULL, NULL, NULL) == ALLOW && + runaslist_matches(def->binding, NULL, NULL, NULL) == ALLOW && !set_default(def->var, def->val, def->op)) rc = false; break; case DEFAULTS_HOST: if (ISSET(what, SETDEF_HOST) && - hostlist_matches(&def->binding) == ALLOW && + hostlist_matches(def->binding) == ALLOW && !set_default(def->var, def->val, def->op)) rc = false; break; case DEFAULTS_CMND: if (ISSET(what, SETDEF_CMND) && - cmndlist_matches(&def->binding) == ALLOW && + cmndlist_matches(def->binding) == ALLOW && !set_default(def->var, def->val, def->op)) rc = false; break; @@ -561,7 +569,7 @@ check_defaults(int what, bool quiet) bool rc = true; debug_decl(check_defaults, SUDO_DEBUG_DEFAULTS) - tq_foreach_fwd(&defaults, def) { + TAILQ_FOREACH(def, &defaults, entries) { switch (def->type) { case DEFAULTS: if (!ISSET(what, SETDEF_GENERIC)) @@ -590,7 +598,7 @@ check_defaults(int what, bool quiet) } if (cur->name == NULL) { if (!quiet) - warningx(_("unknown defaults entry `%s'"), def->var); + warningx(U_("unknown defaults entry `%s'"), def->var); rc = false; } } @@ -600,18 +608,20 @@ check_defaults(int what, bool quiet) static bool store_int(char *val, struct sudo_defs_types *def, int op) { - char *endp; - long l; + const char *errstr; + int i; debug_decl(store_int, SUDO_DEBUG_DEFAULTS) if (op == false) { def->sd_un.ival = 0; } else { - l = strtol(val, &endp, 10); - if (*endp != '\0') + i = strtonum(val, INT_MIN, INT_MAX, &errstr); + if (errstr != NULL) { + sudo_debug_printf(SUDO_DEBUG_ERROR|SUDO_DEBUG_LINENO, + "%s: %s", val, errstr); debug_return_bool(false); - /* XXX - should check against INT_MAX */ - def->sd_un.ival = (int)l; + } + def->sd_un.ival = i; } if (def->callback) debug_return_bool(def->callback(val)); @@ -621,18 +631,20 @@ store_int(char *val, struct sudo_defs_types *def, int static bool store_uint(char *val, struct sudo_defs_types *def, int op) { - char *endp; - long l; + const char *errstr; + unsigned int u; debug_decl(store_uint, SUDO_DEBUG_DEFAULTS) if (op == false) { - def->sd_un.ival = 0; + def->sd_un.uival = 0; } else { - l = strtol(val, &endp, 10); - if (*endp != '\0' || l < 0) + u = strtonum(val, 0, UINT_MAX, &errstr); + if (errstr != NULL) { + sudo_debug_printf(SUDO_DEBUG_ERROR|SUDO_DEBUG_LINENO, + "%s: %s", val, errstr); debug_return_bool(false); - /* XXX - should check against INT_MAX */ - def->sd_un.ival = (unsigned int)l; + } + def->sd_un.uival = u; } if (def->callback) debug_return_bool(def->callback(val)); @@ -667,18 +679,16 @@ store_tuple(char *val, struct sudo_defs_types *def, in debug_decl(store_tuple, SUDO_DEBUG_DEFAULTS) /* - * Since enums are really just ints we store the value as an ival. - * In the future, there may be multiple enums for different tuple - * types we want to avoid and special knowledge of the tuple type. - * This does assume that the first entry in the tuple enum will - * be the equivalent to a boolean "false". + * Look up tuple value by name to find enum def_tuple value. + * For negation to work the first element of enum def_tuple + * must be equivalent to boolean false. */ if (!val) { def->sd_un.ival = (op == false) ? 0 : 1; } else { for (v = def->values; v->sval != NULL; v++) { if (strcmp(v->sval, val) == 0) { - def->sd_un.ival = v->ival; + def->sd_un.tuple = v->nval; break; } } @@ -768,7 +778,7 @@ logfac2str(int n) for (fac = facilities; fac->name && fac->num != n; fac++) ; - debug_return_str(fac->name); + debug_return_const_str(fac->name); #else return "default"; #endif /* LOG_NFACILITIES */ @@ -800,23 +810,26 @@ logpri2str(int n) for (pri = priorities; pri->name && pri->num != n; pri++) ; - debug_return_str(pri->name); + debug_return_const_str(pri->name); } static bool store_mode(char *val, struct sudo_defs_types *def, int op) { - char *endp; - long l; + mode_t mode; + const char *errstr; debug_decl(store_mode, SUDO_DEBUG_DEFAULTS) if (op == false) { - def->sd_un.mode = (mode_t)0777; + def->sd_un.mode = 0777; } else { - l = strtol(val, &endp, 8); - if (*endp != '\0' || l < 0 || l > 0777) + mode = atomode(val, &errstr); + if (errstr != NULL) { + sudo_debug_printf(SUDO_DEBUG_ERROR|SUDO_DEBUG_LINENO, + "%s is %s", val, errstr); debug_return_bool(false); - def->sd_un.mode = (mode_t)l; + } + def->sd_un.mode = mode; } if (def->callback) debug_return_bool(def->callback(val)); @@ -826,43 +839,41 @@ store_mode(char *val, struct sudo_defs_types *def, int static void list_op(char *val, size_t len, struct sudo_defs_types *def, enum list_ops op) { - struct list_member *cur, *prev, *tmp; + struct list_member *cur, *prev = NULL; debug_decl(list_op, SUDO_DEBUG_DEFAULTS) if (op == freeall) { - for (cur = def->sd_un.list; cur; ) { - tmp = cur; - cur = tmp->next; - efree(tmp->value); - efree(tmp); + while ((cur = SLIST_FIRST(&def->sd_un.list)) != NULL) { + SLIST_REMOVE_HEAD(&def->sd_un.list, entries); + efree(cur->value); + efree(cur); } - def->sd_un.list = NULL; debug_return; } - for (cur = def->sd_un.list, prev = NULL; cur; prev = cur, cur = cur->next) { + SLIST_FOREACH(cur, &def->sd_un.list, entries) { if ((strncmp(cur->value, val, len) == 0 && cur->value[len] == '\0')) { if (op == add) debug_return; /* already exists */ /* Delete node */ - if (prev != NULL) - prev->next = cur->next; + if (prev == NULL) + SLIST_REMOVE_HEAD(&def->sd_un.list, entries); else - def->sd_un.list = cur->next; + SLIST_REMOVE_AFTER(prev, entries); efree(cur->value); efree(cur); break; } + prev = cur; } /* Add new node to the head of the list. */ if (op == add) { cur = ecalloc(1, sizeof(struct list_member)); cur->value = estrndup(val, len); - cur->next = def->sd_un.list; - def->sd_un.list = cur; + SLIST_INSERT_HEAD(&def->sd_un.list, cur, entries); } debug_return; }