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

Other new functions: open_files(), close_files().

Browse Source 
This force flushing the password database after the password file is unlocked.
This commit is contained in:
nekral-guest 2007-12-28 22:18:55 +00:00
parent 566b357f99
commit b9eec1ea49
2 changed files with 69 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -4,6 +4,9 @@
pam API was already checked. No need to validate it again. pam API was already checked. No need to validate it again.
* src/chpasswd.c: New functions: process_flags(), check_flags(), * src/chpasswd.c: New functions: process_flags(), check_flags(),
check_perms(). Split out of main(). check_perms(). Split out of main().
* src/chpasswd.c: Other new functions: open_files(), close_files().
This force flushing the password database after the password file is
unlocked.
2007-12-28 Nicolas François <nicolas.francois@centraliens.net> 2007-12-28 Nicolas François <nicolas.francois@centraliens.net>

110
src/chpasswd.c
View File

@ -64,6 +64,8 @@ static void usage (void);
static void process_flags (int argc, char **argv); static void process_flags (int argc, char **argv);
static void check_flags (void); static void check_flags (void);
static void check_perms (void); static void check_perms (void);
static void open_files (void);
static void close_files (void);
/* /*
* usage - display usage message and exit * usage - display usage message and exit
@ -243,6 +245,66 @@ static void check_perms (void)
#endif /* USE_PAM */ #endif /* USE_PAM */
} }
/*
* open_files - lock and open the password databases
*/
static void open_files (void)
{
/*
* Lock the password file and open it for reading and writing. This
* will bring all of the entries into memory where they may be updated.
*/
if (!pw_lock ()) {
fprintf (stderr, _("%s: can't lock password file\n"), Prog);
exit (1);
}
if (!pw_open (O_RDWR)) {
fprintf (stderr, _("%s: can't open password file\n"), Prog);
pw_unlock ();
exit (1);
}
/* Do the same for the shadowed database, if it exist */
if (is_shadow_pwd) {
if (!spw_lock ()) {
fprintf (stderr, _("%s: can't lock shadow file\n"),
Prog);
pw_unlock ();
exit (1);
}
if (!spw_open (O_RDWR)) {
fprintf (stderr, _("%s: can't open shadow file\n"),
Prog);
pw_unlock ();
spw_unlock ();
exit (1);
}
}
}
/*
* close_files - close and unlock the password databases
*/
static void close_files (void)
{
if (is_shadow_pwd) {
if (!spw_close ()) {
fprintf (stderr,
_("%s: error updating shadow file\n"), Prog);
pw_unlock ();
exit (1);
}
spw_unlock ();
}
if (!pw_close ()) {
fprintf (stderr, _("%s: error updating password file\n"), Prog);
exit (1);
}
pw_unlock ();
}
int main (int argc, char **argv) int main (int argc, char **argv)
{ {
char buf[BUFSIZ]; char buf[BUFSIZ];
@ -270,36 +332,9 @@ int main (int argc, char **argv)
check_perms (); check_perms ();
/*
* Lock the password file and open it for reading. This will bring
* all of the entries into memory where they may be updated.
*/
if (!pw_lock ()) {
fprintf (stderr, _("%s: can't lock password file\n"), Prog);
exit (1);
}
if (!pw_open (O_RDWR)) {
fprintf (stderr, _("%s: can't open password file\n"), Prog);
pw_unlock ();
exit (1);
}
is_shadow_pwd = spw_file_present (); is_shadow_pwd = spw_file_present ();
if (is_shadow_pwd) {
if (!spw_lock ()) { open_files ();
fprintf (stderr, _("%s: can't lock shadow file\n"),
Prog);
pw_unlock ();
exit (1);
}
if (!spw_open (O_RDWR)) {
fprintf (stderr, _("%s: can't open shadow file\n"),
Prog);
pw_unlock ();
spw_unlock ();
exit (1);
}
}
/* /*
* Read each line, separating the user name from the password. The * Read each line, separating the user name from the password. The
@ -421,24 +456,11 @@ int main (int argc, char **argv)
pw_unlock (); pw_unlock ();
exit (1); exit (1);
} }
if (is_shadow_pwd) {
if (!spw_close ()) { close_files ();
fprintf (stderr,
_("%s: error updating shadow file\n"), Prog);
pw_unlock ();
exit (1);
}
spw_unlock ();
}
if (!pw_close ()) {
fprintf (stderr, _("%s: error updating password file\n"), Prog);
exit (1);
}
nscd_flush_cache ("passwd"); nscd_flush_cache ("passwd");
pw_unlock ();
#ifdef USE_PAM #ifdef USE_PAM
pam_end (pamh, PAM_SUCCESS); pam_end (pamh, PAM_SUCCESS);
#endif /* USE_PAM */ #endif /* USE_PAM */