/*
- * Copyright (c) 1999-2005 Todd C. Miller <Todd.Miller@courtesan.com>
+ * Copyright (c) 1999-2005, 2007-2008, 2010
+ * Todd C. Miller <Todd.Miller@courtesan.com>
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
#endif /* STDC_HEADERS */
#ifdef HAVE_STRING_H
# include <string.h>
-#else
-# ifdef HAVE_STRINGS_H
-# include <strings.h>
-# endif
#endif /* HAVE_STRING_H */
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif /* HAVE_STRINGS_H */
# ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif /* HAVE_UNISTD_H */
#include <pwd.h>
-#ifdef HAVE_ERR_H
-# include <err.h>
-#else
-# include "emul/err.h"
-#endif /* HAVE_ERR_H */
#include <ctype.h>
#include "sudo.h"
-
-#ifndef lint
-__unused static const char rcsid[] = "$Sudo: defaults.c,v 1.48.2.5 2007/06/18 15:51:35 millert Exp $";
-#endif /* lint */
+#include "parse.h"
+#include <gram.h>
/*
* For converting between syslog numbers and strings.
{ NULL, -1 }
};
-extern int sudolineno;
-
/*
* Local prototypes.
*/
static int store_syslogpri __P((char *, struct sudo_defs_types *, int));
static int store_tuple __P((char *, struct sudo_defs_types *, int));
static int store_uint __P((char *, struct sudo_defs_types *, int));
+static int store_float __P((char *, struct sudo_defs_types *, int));
static void list_op __P((char *, size_t, struct sudo_defs_types *, enum list_ops));
static const char *logfac2str __P((int));
static const char *logpri2str __P((int));
(void) printf(cur->desc, cur->sd_un.ival);
putchar('\n');
break;
+ case T_FLOAT:
+ (void) printf(cur->desc, cur->sd_un.fval);
+ putchar('\n');
+ break;
case T_MODE:
(void) printf(cur->desc, cur->sd_un.mode);
putchar('\n');
break;
}
if (!cur->name) {
- warnx("unknown defaults entry `%s' referenced near line %d",
- var, sudolineno);
+ warningx("unknown defaults entry `%s'", var);
return(FALSE);
}
case T_LOGFAC:
if (!store_syslogfac(val, cur, op)) {
if (val)
- warnx("value `%s' is invalid for option `%s'", val, var);
+ warningx("value `%s' is invalid for option `%s'", val, var);
else
- warnx("no value specified for `%s' on line %d",
- var, sudolineno);
+ warningx("no value specified for `%s'", var);
return(FALSE);
}
break;
case T_LOGPRI:
if (!store_syslogpri(val, cur, op)) {
if (val)
- warnx("value `%s' is invalid for option `%s'", val, var);
+ warningx("value `%s' is invalid for option `%s'", val, var);
else
- warnx("no value specified for `%s' on line %d",
- var, sudolineno);
+ warningx("no value specified for `%s'", var);
return(FALSE);
}
break;
if (!val) {
/* Check for bogus boolean usage or lack of a value. */
if (!ISSET(cur->type, T_BOOL) || op != FALSE) {
- warnx("no value specified for `%s' on line %d",
- var, sudolineno);
+ warningx("no value specified for `%s'", var);
return(FALSE);
}
}
if (ISSET(cur->type, T_PATH) && val && *val != '/') {
- warnx("values for `%s' must start with a '/'", var);
+ warningx("values for `%s' must start with a '/'", var);
return(FALSE);
}
if (!store_str(val, cur, op)) {
- warnx("value `%s' is invalid for option `%s'", val, var);
+ warningx("value `%s' is invalid for option `%s'", val, var);
return(FALSE);
}
break;
if (!val) {
/* Check for bogus boolean usage or lack of a value. */
if (!ISSET(cur->type, T_BOOL) || op != FALSE) {
- warnx("no value specified for `%s' on line %d",
- var, sudolineno);
+ warningx("no value specified for `%s'", var);
return(FALSE);
}
}
if (!store_int(val, cur, op)) {
- warnx("value `%s' is invalid for option `%s'", val, var);
+ warningx("value `%s' is invalid for option `%s'", val, var);
return(FALSE);
}
break;
if (!val) {
/* Check for bogus boolean usage or lack of a value. */
if (!ISSET(cur->type, T_BOOL) || op != FALSE) {
- warnx("no value specified for `%s' on line %d",
- var, sudolineno);
+ warningx("no value specified for `%s'", var);
return(FALSE);
}
}
if (!store_uint(val, cur, op)) {
- warnx("value `%s' is invalid for option `%s'", val, var);
+ warningx("value `%s' is invalid for option `%s'", val, var);
+ return(FALSE);
+ }
+ break;
+ case T_FLOAT:
+ 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);
+ return(FALSE);
+ }
+ }
+ if (!store_float(val, cur, op)) {
+ warningx("value `%s' is invalid for option `%s'", val, var);
return(FALSE);
}
break;
if (!val) {
/* Check for bogus boolean usage or lack of a value. */
if (!ISSET(cur->type, T_BOOL) || op != FALSE) {
- warnx("no value specified for `%s' on line %d",
- var, sudolineno);
+ warningx("no value specified for `%s'", var);
return(FALSE);
}
}
if (!store_mode(val, cur, op)) {
- warnx("value `%s' is invalid for option `%s'", val, var);
+ warningx("value `%s' is invalid for option `%s'", val, var);
return(FALSE);
}
break;
case T_FLAG:
if (val) {
- warnx("option `%s' does not take a value on line %d",
- var, sudolineno);
+ warningx("option `%s' does not take a value", var);
return(FALSE);
}
cur->sd_un.flag = op;
-
- /* Special action for I_FQDN. Move to own switch if we get more */
- if (num == I_FQDN && op)
- set_fqdn();
break;
case T_LIST:
if (!val) {
/* Check for bogus boolean usage or lack of a value. */
if (!ISSET(cur->type, T_BOOL) || op != FALSE) {
- warnx("no value specified for `%s' on line %d",
- var, sudolineno);
+ warningx("no value specified for `%s'", var);
return(FALSE);
}
}
if (!store_list(val, cur, op)) {
- warnx("value `%s' is invalid for option `%s'", val, var);
+ warningx("value `%s' is invalid for option `%s'", val, var);
return(FALSE);
}
break;
case T_TUPLE:
if (!val && !ISSET(cur->type, T_BOOL)) {
- warnx("no value specified for `%s' on line %d",
- var, sudolineno);
+ warningx("no value specified for `%s'", var);
return(FALSE);
}
if (!store_tuple(val, cur, op)) {
- warnx("value `%s' is invalid for option `%s'", val, var);
+ warningx("value `%s' is invalid for option `%s'", val, var);
return(FALSE);
}
break;
static int firsttime = 1;
struct sudo_defs_types *def;
- /* Free any strings that were set. */
+ /* Clear any old settings. */
if (!firsttime) {
- for (def = sudo_defs_table; def->name; def++)
+ for (def = sudo_defs_table; def->name; def++) {
switch (def->type & T_MASK) {
case T_STR:
efree(def->sd_un.str);
list_op(NULL, 0, def, freeall);
break;
}
+ zero_bytes(&def->sd_un, sizeof(def->sd_un));
+ }
}
/* First initialize the flags. */
#ifdef SEND_MAIL_WHEN_NOT_OK
def_mail_no_perms = TRUE;
#endif
-#ifdef USE_TTY_TICKETS
+#ifndef NO_TTY_TICKETS
def_tty_tickets = TRUE;
#endif
#ifndef NO_LECTURE
#ifdef ENV_EDITOR
def_env_editor = TRUE;
#endif
+#ifdef _PATH_SUDO_ASKPASS
+ def_askpass = estrdup(_PATH_SUDO_ASKPASS);
+#endif
+ def_sudoers_locale = estrdup("C");
def_env_reset = TRUE;
def_set_logname = TRUE;
+ def_closefrom = STDERR_FILENO + 1;
/* Syslog options need special care since they both strings and ints */
#if (LOGGING & SLOG_SYSLOG)
def_timestamp_timeout = TIMEOUT;
def_passwd_timeout = PASSWORD_TIMEOUT;
def_passwd_tries = TRIES_FOR_PASSWORD;
+#ifdef HAVE_ZLIB_H
+ def_compress_io = TRUE;
+#endif
/* Now do the strings */
def_mailto = estrdup(MAILTO);
#endif
#ifdef EXEMPTGROUP
def_exempt_group = estrdup(EXEMPTGROUP);
+#endif
+#ifdef SECURE_PATH
+ def_secure_path = estrdup(SECURE_PATH);
#endif
def_editor = estrdup(EDITOR);
#ifdef _PATH_SUDO_NOEXEC
/* Finally do the lists (currently just environment tables). */
init_envtables();
- /*
- * The following depend on the above values.
- * We use a pointer to the string so that if its
- * value changes we get the change.
- */
- if (user_runas == NULL)
- user_runas = &def_runas_default;
-
firsttime = 0;
}
+/*
+ * Update the defaults based on what was set by sudoers.
+ * Pass in an OR'd list of which default types to update.
+ */
+int
+update_defaults(what)
+ int what;
+{
+ struct defaults *def;
+ int rc = TRUE;
+
+ tq_foreach_fwd(&defaults, def) {
+ switch (def->type) {
+ case DEFAULTS:
+ if (ISSET(what, SETDEF_GENERIC) &&
+ !set_default(def->var, def->val, def->op))
+ rc = FALSE;
+ break;
+ case DEFAULTS_USER:
+ if (ISSET(what, SETDEF_USER) &&
+ userlist_matches(sudo_user.pw, &def->binding) == ALLOW &&
+ !set_default(def->var, def->val, def->op))
+ rc = FALSE;
+ break;
+ case DEFAULTS_RUNAS:
+ if (ISSET(what, SETDEF_RUNAS) &&
+ runaslist_matches(&def->binding, 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 &&
+ !set_default(def->var, def->val, def->op))
+ rc = FALSE;
+ break;
+ case DEFAULTS_CMND:
+ if (ISSET(what, SETDEF_CMND) &&
+ cmndlist_matches(&def->binding) == ALLOW &&
+ !set_default(def->var, def->val, def->op))
+ rc = FALSE;
+ break;
+ }
+ }
+ return(rc);
+}
+
static int
store_int(val, def, op)
char *val;
if (*endp != '\0')
return(FALSE);
/* XXX - should check against INT_MAX */
- def->sd_un.ival = (unsigned int)l;
+ def->sd_un.ival = (int)l;
}
if (def->callback)
return(def->callback(val));
return(TRUE);
}
+static int
+store_float(val, def, op)
+ char *val;
+ struct sudo_defs_types *def;
+ int op;
+{
+ char *endp;
+ double d;
+
+ if (op == FALSE) {
+ def->sd_un.fval = 0.0;
+ } else {
+ d = strtod(val, &endp);
+ if (*endp != '\0')
+ return(FALSE);
+ /* XXX - should check against HUGE_VAL */
+ def->sd_un.fval = d;
+ }
+ if (def->callback)
+ return(def->callback(val));
+ return(TRUE);
+}
+
static int
store_tuple(val, def, op)
char *val;
for (fac = facilities; fac->name && fac->num != n; fac++)
;
- return (fac->name);
+ return(fac->name);
#else
- return ("default");
+ return("default");
#endif /* LOG_NFACILITIES */
}
for (pri = priorities; pri->name && pri->num != n; pri++)
;
- return (pri->name);
+ return(pri->name);
}
static int
projects / debian / sudo / blobdiff