From 17c4c04115c7de3f5884ebdc562b0912bbd1b736 Mon Sep 17 00:00:00 2001 From: Tomas Mraz Date: Tue, 8 Dec 2009 09:15:51 +0000 Subject: Relevant BUGIDs: rhbz#545053 Purpose of commit: new feature Commit summary: --------------- 2009-12-08 Tomas Mraz * modules/pam_unix/passverify.c(unix_update_shadow): Create a shadow entry if not present in the file. --- ChangeLog | 3 +++ modules/pam_unix/passverify.c | 25 ++++++++++++++++++------- 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index eeed6fb0..547b2d58 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2009-12-08 Tomas Mraz + * modules/pam_unix/passverify.c(unix_update_shadow): Create a shadow + entry if not present in the file. + * modules/pam_listfile/pam_listfile.c(pam_sm_authenticate): Remove unused function and variable. diff --git a/modules/pam_unix/passverify.c b/modules/pam_unix/passverify.c index 489e8560..d175dfa5 100644 --- a/modules/pam_unix/passverify.c +++ b/modules/pam_unix/passverify.c @@ -839,19 +839,16 @@ done: PAMH_ARG_DECL(int unix_update_shadow, const char *forwho, char *towhat) { - struct spwd *spwdent = NULL, *stmpent = NULL; + struct spwd spwdent, *stmpent = NULL; struct stat st; FILE *pwfile, *opwfile; - int err = 1; + int err = 0; int oldmask; + int wroteentry = 0; #ifdef WITH_SELINUX security_context_t prev_context=NULL; #endif - spwdent = getspnam(forwho); - if (spwdent == NULL) { - return PAM_USER_UNKNOWN; - } oldmask = umask(077); #ifdef WITH_SELINUX @@ -912,7 +909,7 @@ PAMH_ARG_DECL(int unix_update_shadow, if (!strcmp(stmpent->sp_namp, forwho)) { stmpent->sp_pwdp = towhat; stmpent->sp_lstchg = time(NULL) / (60 * 60 * 24); - err = 0; + wroteentry = 1; D(("Set password %s for %s", stmpent->sp_pwdp, forwho)); } @@ -924,8 +921,22 @@ PAMH_ARG_DECL(int unix_update_shadow, stmpent = fgetspent(opwfile); } + fclose(opwfile); + if (!wroteentry && !err) { + spwdent.sp_namp = forwho; + spwdent.sp_pwdp = towhat; + spwdent.sp_lstchg = time(NULL) / (60 * 60 * 24); + spwdent.sp_min = spwdent.sp_max = spwdent.sp_warn = spwdent.sp_inact = + spwdent.sp_expire = -1; + spwdent.sp_flag = (unsigned long)-1l; + if (putspent(&spwdent, pwfile)) { + D(("error writing entry to shadow file: %m")); + err = 1; + } + } + if (fflush(pwfile) || fsync(fileno(pwfile))) { D(("fflush or fsync error writing entries to shadow file: %m")); err = 1; -- cgit v1.2.3