isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Treat USERNAME environemnt variable like LOGNAME/USER

Browse Source
This commit is contained in:
Todd C. Miller
2007-06-18 21:23:48 +00:00
parent 549c88d513
commit c225668972
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
env.c
View File

@@ -65,6 +65,8 @@ __unused static const char rcsid[] = "$Sudo$";
#define DID_LOGNAME 0x0010 #define DID_LOGNAME 0x0010
#undef DID_USER #undef DID_USER
#define DID_USER 0x0020 #define DID_USER 0x0020
#undef DID_USERNAME
#define DID_USERNAME 0x0040
#undef DID_MAX #undef DID_MAX
#define DID_MAX 0x00ff #define DID_MAX 0x00ff
@@ -80,6 +82,8 @@ __unused static const char rcsid[] = "$Sudo$";
#define KEPT_LOGNAME 0x1000 #define KEPT_LOGNAME 0x1000
#undef KEPT_USER #undef KEPT_USER
#define KEPT_USER 0x2000 #define KEPT_USER 0x2000
#undef KEPT_USERNAME
#define KEPT_USERNAME 0x4000
#undef KEPT_MAX #undef KEPT_MAX
#define KEPT_MAX 0xff00 #define KEPT_MAX 0xff00
@@ -372,6 +376,8 @@ rebuild_env(envp, sudo_mode, noexec)
case 'U': case 'U':
if (strncmp(*ep, "USER=", 5) == 0) if (strncmp(*ep, "USER=", 5) == 0)
SET(didvar, DID_USER); SET(didvar, DID_USER);
if (strncmp(*ep, "USERNAME=", 5) == 0)
SET(didvar, DID_USERNAME);
break; break;
} }
insert_env(*ep, &env, 0); insert_env(*ep, &env, 0);
@@ -393,6 +399,8 @@ rebuild_env(envp, sudo_mode, noexec)
ISSET(didvar, DID_LOGNAME)); ISSET(didvar, DID_LOGNAME));
insert_env(format_env("USER", runas_pw->pw_name, VNULL), &env, insert_env(format_env("USER", runas_pw->pw_name, VNULL), &env,
ISSET(didvar, DID_USER)); ISSET(didvar, DID_USER));
insert_env(format_env("USERNAME", runas_pw->pw_name, VNULL), &env,
ISSET(didvar, DID_USERNAME));
} else { } else {
if (!ISSET(didvar, DID_HOME)) if (!ISSET(didvar, DID_HOME))
insert_env(format_env("HOME", user_dir, VNULL), &env, 0); insert_env(format_env("HOME", user_dir, VNULL), &env, 0);
@@ -403,6 +411,8 @@ rebuild_env(envp, sudo_mode, noexec)
insert_env(format_env("LOGNAME", user_name, VNULL), &env, 0); insert_env(format_env("LOGNAME", user_name, VNULL), &env, 0);
if (!ISSET(didvar, DID_USER)) if (!ISSET(didvar, DID_USER))
insert_env(format_env("USER", user_name, VNULL), &env, 0); insert_env(format_env("USER", user_name, VNULL), &env, 0);
if (!ISSET(didvar, DID_USERNAME))
insert_env(format_env("USERNAME", user_name, VNULL), &env, 0);
} }
} else { } else {
/* /*
@@ -466,12 +476,14 @@ rebuild_env(envp, sudo_mode, noexec)
SET(didvar, DID_PATH); SET(didvar, DID_PATH);
} }
/* Set $USER and $LOGNAME to target if "set_logname" is true. */ /* Set $USER, $LOGNAME and $USERNAME to target if "set_logname" is true. */
if (def_set_logname && runas_pw->pw_name) { if (def_set_logname && runas_pw->pw_name) {
if (!ISSET(didvar, KEPT_LOGNAME)) if (!ISSET(didvar, KEPT_LOGNAME))
insert_env(format_env("LOGNAME", runas_pw->pw_name, VNULL), &env, 1); insert_env(format_env("LOGNAME", runas_pw->pw_name, VNULL), &env, 1);
if (!ISSET(didvar, KEPT_USER)) if (!ISSET(didvar, KEPT_USER))
insert_env(format_env("USER", runas_pw->pw_name, VNULL), &env, 1); insert_env(format_env("USER", runas_pw->pw_name, VNULL), &env, 1);
if (!ISSET(didvar, KEPT_USERNAME))
insert_env(format_env("USERNAME", runas_pw->pw_name, VNULL), &env, 1);
} }
/* Set $HOME for `sudo -H'. Only valid at PERM_FULL_RUNAS. */ /* Set $HOME for `sudo -H'. Only valid at PERM_FULL_RUNAS. */

1
logging.c
View File

@@ -436,6 +436,7 @@ send_mail(line)
"HOME=/", "HOME=/",
"PATH=/usr/bin:/bin", "PATH=/usr/bin:/bin",
"LOGNAME=root", "LOGNAME=root",
"USERNAME=root",
"USER=root", "USER=root",
NULL NULL
}; };