diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 2004-11-17 18:14:07 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 2004-11-17 18:14:07 +0000 |
| commit | 420dd8a8848151752622786dfd4e9cb46c71542a (patch) | |
| tree | 1a0611aa08791a9eb446a429e1318659c32276ae /usr.bin/sudo/env.c | |
| parent | e4305d6dad6e764d32902d947b4c30363f19d2fe (diff) | |
Update to sudo 1.6.8p4
Diffstat (limited to 'usr.bin/sudo/env.c')
| -rw-r--r-- | usr.bin/sudo/env.c | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/usr.bin/sudo/env.c b/usr.bin/sudo/env.c index 5a05a4516ee..3f58b446ee4 100644 --- a/usr.bin/sudo/env.c +++ b/usr.bin/sudo/env.c @@ -88,6 +88,7 @@ static char *format_env __P((char *, ...)); */ static const char *initial_badenv_table[] = { "IFS", + "CDPATH", "LOCALDOMAIN", "RES_OPTIONS", "HOSTALIASES", @@ -141,7 +142,7 @@ static size_t env_size; /* size of new_environ in char **'s */ static size_t env_len; /* number of slots used, not counting NULL */ /* - * Zero out environment and replace with a minimal set of + * Zero out environment and replace with a minimal set of KRB5CCNAME * USER, LOGNAME, HOME, TZ, PATH (XXX - should just set path to default) * May set user_path, user_shell, and/or user_prompt as side effects. */ @@ -149,8 +150,9 @@ char ** zero_env(envp) char **envp; { - static char *newenv[8]; + static char *newenv[9]; char **ep, **nep = newenv; + char **ne_last = &newenv[(sizeof(newenv) / sizeof(newenv[0])) - 1]; extern char *prev_user; for (ep = envp; *ep; ep++) { @@ -159,6 +161,10 @@ zero_env(envp) if (strncmp("HOME=", *ep, 5) == 0) break; continue; + case 'K': + if (strncmp("KRB5CCNAME=", *ep, 11) == 0) + break; + continue; case 'L': if (strncmp("LOGNAME=", *ep, 8) == 0) break; @@ -195,8 +201,12 @@ zero_env(envp) if (**nep == **ep) break; } - if (*nep == NULL) - *nep++ = *ep; + if (*nep == NULL) { + if (nep < ne_last) + *nep++ = *ep; + else + errx(1, "internal error, attempt to write outside newenv"); + } } #ifdef HAVE_LDAP @@ -205,7 +215,10 @@ zero_env(envp) * or files in the current directory. * */ - *nep++ = "LDAPNOINIT=1"; + if (nep < ne_last) + *nep++ = "LDAPNOINIT=1"; + else + errx(1, "internal error, attempt to write outside newenv"); #endif return(&newenv[0]); |