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

* src/pwunconv.c: Use a bool when possible instead of int

Browse Source 
integers.
	* src/pwunconv.c: Add brackets and parenthesis.
	* src/pwunconv.c: Ignore return value of setlocale(),
	bindtextdomain(), and textdomain().
	* src/pwunconv.c: Avoid implicit conversion of pointers / integers
	/ chars to booleans.
	* src/pwunconv.c: Avoid assignments in comparisons.
This commit is contained in:
nekral-guest 2008-06-09 20:30:34 +00:00
parent a9f1ce0db1
commit 6aa98c17bd
2 changed files with 38 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -1,3 +1,14 @@
2008-06-09 Nicolas François <nicolas.francois@centraliens.net>
* src/pwunconv.c: Use a bool when possible instead of int
integers.
* src/pwunconv.c: Add brackets and parenthesis.
* src/pwunconv.c: Ignore return value of setlocale(),
bindtextdomain(), and textdomain().
* src/pwunconv.c: Avoid implicit conversion of pointers / integers
/ chars to booleans.
* src/pwunconv.c: Avoid assignments in comparisons.
2008-06-09 Nicolas François <nicolas.francois@centraliens.net> 2008-06-09 Nicolas François <nicolas.francois@centraliens.net>
* src/usermod.c: Use a bool when possible instead of int integers. * src/usermod.c: Use a bool when possible instead of int integers.

46
src/pwunconv.c
View File

@ -47,17 +47,20 @@
/* /*
* Global variables * Global variables
*/ */
static int shadow_locked = 0, passwd_locked = 0; static bool shadow_locked = false;
static bool passwd_locked = false;
/* local function prototypes */ /* local function prototypes */
static void fail_exit (int); static void fail_exit (int);
static void fail_exit (int status) static void fail_exit (int status)
{ {
if (shadow_locked) if (shadow_locked) {
spw_unlock (); spw_unlock ();
if (passwd_locked) }
if (passwd_locked) {
pw_unlock (); pw_unlock ();
}
exit (status); exit (status);
} }
@ -70,46 +73,50 @@ int main (int argc, char **argv)
char *Prog = argv[0]; char *Prog = argv[0];
setlocale (LC_ALL, ""); (void) setlocale (LC_ALL, "");
bindtextdomain (PACKAGE, LOCALEDIR); (void) bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE); (void) textdomain (PACKAGE);
if (!spw_file_present ()) if (!spw_file_present ()) {
/* shadow not installed, do nothing */ /* shadow not installed, do nothing */
exit (0); exit (0);
}
if (!pw_lock ()) { if (pw_lock () == 0) {
fprintf (stderr, _("%s: can't lock passwd file\n"), Prog); fprintf (stderr, _("%s: can't lock passwd file\n"), Prog);
fail_exit (5); fail_exit (5);
} }
passwd_locked++; passwd_locked = true;
if (!pw_open (O_RDWR)) { if (pw_open (O_RDWR) == 0) {
fprintf (stderr, _("%s: can't open passwd file\n"), Prog); fprintf (stderr, _("%s: can't open passwd file\n"), Prog);
fail_exit (1); fail_exit (1);
} }
if (!spw_lock ()) { if (spw_lock () == 0) {
fprintf (stderr, _("%s: can't lock shadow file\n"), Prog); fprintf (stderr, _("%s: can't lock shadow file\n"), Prog);
fail_exit (5); fail_exit (5);
} }
shadow_locked++; shadow_locked = true;
if (!spw_open (O_RDWR)) { if (spw_open (O_RDWR) == 0) {
fprintf (stderr, _("%s: can't open shadow file\n"), Prog); fprintf (stderr, _("%s: can't open shadow file\n"), Prog);
fail_exit (1); fail_exit (1);
} }
pw_rewind (); pw_rewind ();
while ((pw = pw_next ())) { while ((pw = pw_next ()) != NULL) {
if (!(spwd = spw_locate (pw->pw_name))) spwd = spw_locate (pw->pw_name);
if (NULL == spwd) {
continue; continue;
}
pwent = *pw; pwent = *pw;
/* /*
* Update password if non-shadow is "x". * Update password if non-shadow is "x".
*/ */
if (strcmp (pw->pw_passwd, SHADOW_PASSWD_STRING) == 0) if (strcmp (pw->pw_passwd, SHADOW_PASSWD_STRING) == 0) {
pwent.pw_passwd = spwd->sp_pwdp; pwent.pw_passwd = spwd->sp_pwdp;
}
/* /*
* Password aging works differently in the two different * Password aging works differently in the two different
@ -121,7 +128,7 @@ int main (int argc, char **argv)
* put into the new file. Otherwise, the days are converted * put into the new file. Otherwise, the days are converted
* to weeks and so on. * to weeks and so on.
*/ */
if (!pw_update (&pwent)) { if (pw_update (&pwent) == 0) {
fprintf (stderr, fprintf (stderr,
_("%s: can't update entry for user %s\n"), _("%s: can't update entry for user %s\n"),
Prog, pwent.pw_name); Prog, pwent.pw_name);
@ -129,13 +136,13 @@ int main (int argc, char **argv)
} }
} }
if (!spw_close ()) { if (spw_close () == 0) {
fprintf (stderr, fprintf (stderr,
_("%s: can't update shadow password file\n"), Prog); _("%s: can't update shadow password file\n"), Prog);
fail_exit (3); fail_exit (3);
} }
if (!pw_close ()) { if (pw_close () == 0) {
fprintf (stderr, _("%s: can't update password file\n"), Prog); fprintf (stderr, _("%s: can't update password file\n"), Prog);
fail_exit (3); fail_exit (3);
} }
@ -153,3 +160,4 @@ int main (int argc, char **argv)
return 0; return 0;
} }