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

* src/grpconv.c: Fail if not called correctly.

Browse Source 
* src/grpconv.c: At the end of main, the passwd and shadow files
	are locked. No need to check before unlocking. No need to set the
	lock as false neither since there cannot be anymore failures.
This commit is contained in:
nekral-guest 2011-09-18 20:26:27 +00:00
parent fa96d1bb78
commit 2b5ba27ff8
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2011-09-18 Nicolas François <nicolas.francois@centraliens.net>
* src/grpconv.c: Fail if not called correctly.
* src/grpconv.c: At the end of main, the passwd and shadow files
are locked. No need to check before unlocking. No need to set the
lock as false neither since there cannot be anymore failures.
2011-09-18 Nicolas François <nicolas.francois@centraliens.net> 2011-09-18 Nicolas François <nicolas.francois@centraliens.net>
* src/chage.c: EPOCH is not needed, it's converted to -1 by * src/chage.c: EPOCH is not needed, it's converted to -1 by

4
src/grpconv.c
View File

@ -1,6 +1,7 @@
/* /*
* Copyright (c) 1996 - 2000, Marek Michałkiewicz * Copyright (c) 1996 - 2000, Marek Michałkiewicz
* Copyright (c) 2002 - 2006, Tomasz Kłoczko * Copyright (c) 2002 - 2006, Tomasz Kłoczko
* Copyright (c) 2011 , Nicolas François
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -91,6 +92,7 @@ int main (int argc, char **argv)
if (1 != argc) { if (1 != argc) {
(void) fputs (_("Usage: grpconv\n"), stderr); (void) fputs (_("Usage: grpconv\n"), stderr);
fail_exit (2);
} }
Prog = Basename (argv[0]); Prog = Basename (argv[0]);
@ -209,13 +211,11 @@ int main (int argc, char **argv)
SYSLOG ((LOG_ERR, "failed to unlock %s", sgr_dbname ())); SYSLOG ((LOG_ERR, "failed to unlock %s", sgr_dbname ()));
/* continue */ /* continue */
} }
sgr_locked = false;
if (gr_unlock () == 0) { if (gr_unlock () == 0) {
fprintf (stderr, _("%s: failed to unlock %s\n"), Prog, gr_dbname ()); fprintf (stderr, _("%s: failed to unlock %s\n"), Prog, gr_dbname ());
SYSLOG ((LOG_ERR, "failed to unlock %s", gr_dbname ())); SYSLOG ((LOG_ERR, "failed to unlock %s", gr_dbname ()));
/* continue */ /* continue */
} }
gr_locked = false;
nscd_flush_cache ("group"); nscd_flush_cache ("group");