mir/sudo
2
0
Fork 0
mirror of https://github.com/sudo-project/sudo.git synced 2025-09-02 07:15:27 +00:00
Code Issues Releases Wiki Activity

Add flag to sudo_pwdup that indicates whether or not to lookup the

Browse Source 
shadow password.  Will be used to a struct passwd that has the
shadow password already filled in.
This commit is contained in:
Todd C. Miller
2004-09-25 21:01:46 +00:00
parent 28736eb556
commit ea5307a433
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
getspwuid.c
View File

@@ -176,8 +176,9 @@ sudo_getepw(pw)
* that we care about. Fills in pw_passwd from shadow file if necessary. * that we care about. Fills in pw_passwd from shadow file if necessary.
*/ */
struct passwd * struct passwd *
sudo_pwdup(pw) sudo_pwdup(pw, checkshadow)
const struct passwd *pw; const struct passwd *pw;
int checkshadow;
{ {
char *cp; char *cp;
const char *pw_passwd, *pw_shell; const char *pw_passwd, *pw_shell;
@@ -185,7 +186,7 @@ sudo_pwdup(pw)
struct passwd *newpw; struct passwd *newpw;
/* Get shadow password if available. */ /* Get shadow password if available. */
pw_passwd = sudo_getepw(pw); pw_passwd = checkshadow ? sudo_getepw(pw) : pw->pw_passwd;
/* If shell field is empty, expand to _PATH_BSHELL. */ /* If shell field is empty, expand to _PATH_BSHELL. */
pw_shell = (pw->pw_shell == NULL || pw->pw_shell[0] == '\0') pw_shell = (pw->pw_shell == NULL || pw->pw_shell[0] == '\0')
@@ -279,7 +280,7 @@ sudo_getpwuid(uid)
if ((pw = getpwuid(uid)) == NULL) if ((pw = getpwuid(uid)) == NULL)
return(NULL); return(NULL);
else else
return(sudo_pwdup(pw)); return(sudo_pwdup(pw, 1));
} }
/* /*
@@ -295,5 +296,5 @@ sudo_getpwnam(name)
if ((pw = getpwnam(name)) == NULL) if ((pw = getpwnam(name)) == NULL)
return(NULL); return(NULL);
else else
return(sudo_pwdup(pw)); return(sudo_pwdup(pw, 1));
} }