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

Avoid implicit brackets.

Browse Source
This commit is contained in:
nekral-guest 2007-12-28 22:34:14 +00:00
parent f54464bcf6
commit 8dc959ea1f
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -8,6 +8,7 @@
This force flushing the password database after the password file is This force flushing the password database after the password file is
unlocked. unlocked.
* src/chpasswd.c: Avoid assignments in comparisons. * src/chpasswd.c: Avoid assignments in comparisons.
* src/chpasswd.c: Avoid implicit brackets.
2007-12-28 Nicolas François <nicolas.francois@centraliens.net> 2007-12-28 Nicolas François <nicolas.francois@centraliens.net>

23
src/chpasswd.c
View File

@ -382,13 +382,15 @@ int main (int argc, char **argv)
(NULL == crypt_method || (NULL == crypt_method ||
0 != strcmp(crypt_method, "NONE"))) { 0 != strcmp(crypt_method, "NONE"))) {
void *arg = NULL; void *arg = NULL;
if (md5flg) if (md5flg) {
crypt_method = "MD5"; crypt_method = "MD5";
else if (crypt_method != NULL) { } else if (crypt_method != NULL) {
if (sflg) if (sflg) {
arg = &sha_rounds; arg = &sha_rounds;
} else }
} else {
crypt_method = NULL; crypt_method = NULL;
}
cp = pw_encrypt (newpwd, cp = pw_encrypt (newpwd,
crypt_make_salt(crypt_method, arg)); crypt_make_salt(crypt_method, arg));
} }
@ -405,10 +407,11 @@ int main (int argc, char **argv)
errors++; errors++;
continue; continue;
} }
if (is_shadow_pwd) if (is_shadow_pwd) {
sp = spw_locate (name); sp = spw_locate (name);
else } else {
sp = NULL; sp = NULL;
}
/* /*
* The freshly encrypted new password is merged into the * The freshly encrypted new password is merged into the
@ -429,10 +432,11 @@ int main (int argc, char **argv)
* be written to the password file later, after all the * be written to the password file later, after all the
* other entries have been updated as well. * other entries have been updated as well.
*/ */
if (sp) if (sp) {
ok = spw_update (&newsp); ok = spw_update (&newsp);
else } else {
ok = pw_update (&newpw); ok = pw_update (&newpw);
}
if (!ok) { if (!ok) {
fprintf (stderr, fprintf (stderr,
@ -454,8 +458,9 @@ int main (int argc, char **argv)
if (errors) { if (errors) {
fprintf (stderr, fprintf (stderr,
_("%s: error detected, changes ignored\n"), Prog); _("%s: error detected, changes ignored\n"), Prog);
if (is_shadow_pwd) if (is_shadow_pwd) {
spw_unlock (); spw_unlock ();
}
pw_unlock (); pw_unlock ();
exit (1); exit (1);
} }