emo/shadow
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

Add forgotten files in the previous ChangeLog entry.

Browse Source
This commit is contained in:
nekral-guest
2007-11-18 23:20:02 +00:00
parent 9adfc136b6
commit dcedc12f36
3 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/login.c
View File

@@ -647,7 +647,7 @@ int main (int argc, char **argv)
(const void **) &pam_user);
if (pam_user && pam_user[0]) {
pwd = getpwnam(pam_user);
pwd = xgetpwnam(pam_user);
if (pwd) {
pwent = *pwd;
failent_user = pwent.pw_name;
@@ -693,6 +693,7 @@ int main (int argc, char **argv)
char buf[64];
audit_fd = audit_open ();
/* local, no need for xgetpwnam */
pw = getpwnam (username);
if (pw) {
snprintf (buf, sizeof (buf),
@@ -738,9 +739,9 @@ int main (int argc, char **argv)
retcode =
pam_get_item (pamh, PAM_USER, (const void **) &pam_user);
setpwent ();
pwd = getpwnam (pam_user);
pwd = xgetpwnam (pam_user);
if (!pwd) {
SYSLOG ((LOG_ERR, "getpwnam(%s) failed",
SYSLOG ((LOG_ERR, "xgetpwnam(%s) failed",
getdef_bool ("LOG_UNKFAIL_ENAB") ?
pam_user : "UNKNOWN"));
exit (1);
@@ -779,10 +780,10 @@ int main (int argc, char **argv)
#endif /* ! USE_PAM */
#ifdef USE_PAM
if (!(pwd = getpwnam (pam_user))) {
if (!(pwd = xgetpwnam (pam_user))) {
pwent.pw_name = pam_user;
#else
if (!(pwd = getpwnam (username))) {
if (!(pwd = xgetpwnam (username))) {
pwent.pw_name = username;
#endif
strcpy (temp_pw, "!");
@@ -797,6 +798,7 @@ int main (int argc, char **argv)
#ifndef USE_PAM
spwd = NULL;
if (pwd && strcmp (pwd->pw_passwd, SHADOW_PASSWD_STRING) == 0) {
/* !USE_PAM, no need for xgetspnam */
spwd = getspnam (username);
if (spwd)
pwent.pw_passwd = spwd->sp_pwdp;
@@ -996,7 +998,9 @@ int main (int argc, char **argv)
*/
if (spwd) { /* check for age of password */
if (expire (&pwent, spwd)) {
/* !USE_PAM, no need for xgetpwnam */
pwd = getpwnam (username);
/* !USE_PAM, no need for xgetspnam */
spwd = getspnam (username);
if (pwd)
pwent = *pwd;