[Pkg-shadow-commits] r2327 - in upstream/trunk: . src
nekral-guest at alioth.debian.org
nekral-guest at alioth.debian.org
Sun Aug 31 17:29:51 UTC 2008
Author: nekral-guest
Date: 2008-08-31 17:29:51 +0000 (Sun, 31 Aug 2008)
New Revision: 2327
Modified:
upstream/trunk/ChangeLog
upstream/trunk/src/passwd.c
Log:
* src/passwd.c: Add brackets and parenthesis.
* src/passwd.c: Avoid implicit conversion of pointers to booleans.
* src/passwd.c: Avoid assignments in comparisons.
Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog 2008-08-31 17:29:41 UTC (rev 2326)
+++ upstream/trunk/ChangeLog 2008-08-31 17:29:51 UTC (rev 2327)
@@ -1,5 +1,11 @@
2008-08-29 Nicolas François <nicolas.francois at centraliens.net>
+ * src/passwd.c: Add brackets and parenthesis.
+ * src/passwd.c: Avoid implicit conversion of pointers to booleans.
+ * src/passwd.c: Avoid assignments in comparisons.
+
+2008-08-29 Nicolas François <nicolas.francois at centraliens.net>
+
* NEWS, src/groupmems.c, man/groupmems.8.xml: Added support for
shadow groups.
* src/groupmems.c: Use fail_exit() instead of exit().
Modified: upstream/trunk/src/passwd.c
===================================================================
--- upstream/trunk/src/passwd.c 2008-08-31 17:29:41 UTC (rev 2326)
+++ upstream/trunk/src/passwd.c 2008-08-31 17:29:51 UTC (rev 2327)
@@ -195,7 +195,7 @@
reason = FascistHistory (pass, pw->pw_uid);
#endif
- if (reason) {
+ if (NULL != reason) {
printf (_("Bad password: %s. "), reason);
return 1;
}
@@ -229,8 +229,10 @@
*/
if (!amroot && crypt_passwd[0]) {
- if (!(clear = getpass (_("Old password: "))))
+ clear = getpass (_("Old password: "));
+ if (NULL == clear) {
return -1;
+ }
cipher = pw_encrypt (clear, crypt_passwd);
if (strcmp (cipher, crypt_passwd) != 0) {
@@ -256,18 +258,20 @@
* for initial login passwords.
*/
if ((method = getdef_str ("ENCRYPT_METHOD")) == NULL) {
- if (!getdef_bool ("MD5_CRYPT_ENAB"))
+ if (!getdef_bool ("MD5_CRYPT_ENAB")) {
pass_max_len = getdef_num ("PASS_MAX_LEN", 8);
+ }
} else {
- if ( !strcmp (method, "MD5")
+ if ( (strcmp (method, "MD5") == 0)
#ifdef USE_SHA_CRYPT
- || !strcmp (method, "SHA256")
- || !strcmp (method, "SHA512")
+ || (strcmp (method, "SHA256") == 0)
+ || (strcmp (method, "SHA512") == 0)
#endif
- )
+ ) {
pass_max_len = -1;
- else
+ } else {
pass_max_len = getdef_num ("PASS_MAX_LEN", 8);
+ }
}
if (!qflg) {
if (pass_max_len == -1) {
@@ -285,12 +289,14 @@
warned = 0;
for (i = getdef_num ("PASS_CHANGE_TRIES", 5); i > 0; i--) {
- if (!(cp = getpass (_("New password: ")))) {
+ cp = getpass (_("New password: "));
+ if (NULL == cp) {
memzero (orig, sizeof orig);
return -1;
}
- if (warned && strcmp (pass, cp) != 0)
+ if (warned && (strcmp (pass, cp) != 0)) {
warned = 0;
+ }
STRFCPY (pass, cp);
strzero (cp);
@@ -310,13 +316,14 @@
warned++;
continue;
}
- if (!(cp = getpass (_("Re-enter new password: ")))) {
+ cp = getpass (_("Re-enter new password: "));
+ if (NULL == cp) {
memzero (orig, sizeof orig);
return -1;
}
- if (strcmp (cp, pass))
+ if (strcmp (cp, pass) != 0) {
fputs (_("They don't match; try again.\n"), stderr);
- else {
+ } else {
strzero (cp);
break;
}
@@ -358,8 +365,9 @@
* If not expired and the "change only if expired" option (idea from
* PAM) was specified, do nothing. --marekm
*/
- if (kflg && exp_status == 0)
+ if (kflg && (0 == exp_status)) {
exit (E_SUCCESS);
+ }
/*
* Root can change any password any time.
More information about the Pkg-shadow-commits
mailing list