[Pkg-shadow-commits] r3459 - in upstream/trunk: . src
Nicolas FRANÇOIS
nekral-guest at alioth.debian.org
Sat Jul 30 01:46:24 UTC 2011
Author: nekral-guest
Date: 2011-07-30 01:46:23 +0000 (Sat, 30 Jul 2011)
New Revision: 3459
Modified:
upstream/trunk/ChangeLog
upstream/trunk/src/chgpasswd.c
Log:
* src/chgpasswd.c: Fix typo sp -> sg. sg_namp -> sg_name
* src/chgpasswd.c: Always update the group file when SHADOWGRP is
not enabled.
Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog 2011-07-30 01:41:56 UTC (rev 3458)
+++ upstream/trunk/ChangeLog 2011-07-30 01:46:23 UTC (rev 3459)
@@ -1,5 +1,11 @@
2011-07-30 Nicolas François <nicolas.francois at centraliens.net>
+ * src/chgpasswd.c: Fix typo sp -> sg. sg_namp -> sg_name
+ * src/chgpasswd.c: Always update the group file when SHADOWGRP is
+ not enabled.
+
+2011-07-30 Nicolas François <nicolas.francois at centraliens.net>
+
* src/newgrp.c: Fix typo in notreached annotation.
2011-07-30 Nicolas François <nicolas.francois at centraliens.net>
Modified: upstream/trunk/src/chgpasswd.c
===================================================================
--- upstream/trunk/src/chgpasswd.c 2011-07-30 01:41:56 UTC (rev 3458)
+++ upstream/trunk/src/chgpasswd.c 2011-07-30 01:46:23 UTC (rev 3459)
@@ -450,7 +450,7 @@
newpwd = cp;
if ( (!eflg)
&& ( (NULL == crypt_method)
- || (0 != strcmp(crypt_method, "NONE")))) {
+ || (0 != strcmp (crypt_method, "NONE")))) {
void *arg = NULL;
if (md5flg) {
crypt_method = "MD5";
@@ -461,7 +461,7 @@
}
#endif
cp = pw_encrypt (newpwd,
- crypt_make_salt(crypt_method, arg));
+ crypt_make_salt (crypt_method, arg));
}
/*
@@ -486,15 +486,15 @@
*/
sg = sgr_locate (name);
- if ( (NULL == sp)
- && (strcmp (pw->pw_passwd,
+ if ( (NULL == sg)
+ && (strcmp (gr->gr_passwd,
SHADOW_PASSWD_STRING) == 0)) {
static char *empty = NULL;
/* If the password is set to 'x' in
* group, but there are no entries in
* gshadow, create one.
*/
- newsg.sg_namp = name;
+ newsg.sg_name = name;
/* newsg.sg_passwd = NULL; will be set later */
newsg.sg_adm = ∅
newsg.sg_mem = dup_list (gr->gr_mem);
@@ -514,9 +514,10 @@
newsg = *sg;
newsg.sg_passwd = cp;
}
+ if ( (NULL == sg)
+ || (strcmp (gr->gr_passwd, SHADOW_PASSWD_STRING) != 0))
#endif
- if ( (NULL == sg)
- || (strcmp (gr->gr_passwd, SHADOW_PASSWD_STRING) != 0)) {
+ {
newgr = *gr;
newgr.gr_passwd = cp;
}
@@ -536,9 +537,10 @@
continue;
}
}
+ if ( (NULL == sg)
+ || (strcmp (gr->gr_passwd, SHADOW_PASSWD_STRING) != 0))
#endif
- if ( (NULL == sg)
- || (strcmp (gr->gr_passwd, SHADOW_PASSWD_STRING) != 0)) {
+ {
if (gr_update (&newgr) == 0) {
fprintf (stderr,
_("%s: line %d: failed to prepare the new %s entry '%s'\n"),
More information about the Pkg-shadow-commits
mailing list