[Pkg-shadow-commits] r1869 - in upstream/trunk: . src

Tue Feb 26 20:09:57 UTC 2008

Author: nekral-guest
Date: 2008-02-26 20:09:56 +0000 (Tue, 26 Feb 2008)
New Revision: 1869

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/NEWS
   upstream/trunk/src/gpasswd.c
Log:
When a password is moved to the gshadow file, use "x" instead of "x"
to indicate that the password is shadowed (consistency with grpconv).


Modified: upstream/trunk/ChangeLog
===================================================================

--- upstream/trunk/ChangeLog	2008-02-26 19:17:20 UTC (rev 1868)
+++ upstream/trunk/ChangeLog	2008-02-26 20:09:56 UTC (rev 1869)
@@ -1,5 +1,11 @@
 2008-02-26  Nicolas François  <nicolas.francois at centraliens.net>
 
+	* src/gpasswd.c: When a password is moved to the gshadow file, use
+	"x" instead of "x" to indicate that the password is shadowed
+	(consistency with grpconv).
+
+2008-02-26  Nicolas François  <nicolas.francois at centraliens.net>
+
 	* NEWS: Fix failures when the gshadow file is not present. Thanks
 	to Christian Henz (http://bugs.debian.org/467488)
 	* src/gpasswd.c (get_group): Do not fail if gshadow is not present. Just use

Modified: upstream/trunk/NEWS
===================================================================
--- upstream/trunk/NEWS	2008-02-26 19:17:20 UTC (rev 1868)
+++ upstream/trunk/NEWS	2008-02-26 20:09:56 UTC (rev 1869)
@@ -23,6 +23,8 @@
     passwd entry, but no shadow entry.
 - gpasswd
   * Fix failures when the gshadow file is not present.
+  * When a password is moved to the gshadow file, use "x" instead of "x"
+    to indicate that the password is shadowed (consistency with grpconv).
 - groupadd
   * New option -p/--password to specify an encrypted password.
   * New option -r, --system for system accounts.

Modified: upstream/trunk/src/gpasswd.c
===================================================================
--- upstream/trunk/src/gpasswd.c	2008-02-26 19:17:20 UTC (rev 1868)
+++ upstream/trunk/src/gpasswd.c	2008-02-26 20:09:56 UTC (rev 1869)
@@ -574,7 +574,7 @@
 		} else {
 			sg->sg_name = xstrdup (group);
 			sg->sg_passwd = gr->gr_passwd;
-			gr->gr_passwd = "!";	/* XXX warning: const */
+			gr->gr_passwd = SHADOW_PASSWD_STRING;	/* XXX warning: const */
 
 			sg->sg_mem = dup_list (gr->gr_mem);
 


