When a password is moved to the gshadow file, use "x" instead of "x"

to indicate that the password is shadowed (consistency with grpconv).

diff --git a/ChangeLog b/ChangeLog
index 7c57f2c51fdae6fe18fa02c58ef7a46ea45c259e..1a8ca3e04dcf3f62dc0d05b79ba6d5424fa49788 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-02-26  Nicolas François  <nicolas.francois@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@centraliens.net>
 
        * NEWS: Fix failures when the gshadow file is not present. Thanks

diff --git a/NEWS b/NEWS
index 5e85b8799ae5bb522fd0af20327b938dfa870c79..a837bf38f3d2c1dd9b571915db4961ae18c82c20 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -23,6 +23,8 @@ shadow-4.1.0 -> shadow-4.1.1                                          UNRELEASED
     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.

diff --git a/src/gpasswd.c b/src/gpasswd.c
index 9473d89c71722e24338f651f4ef452fbbbf8fb52..d3192ad62c316f5645662c3d156b47775a0e5cef 100644 (file)
--- a/src/gpasswd.c
+++ b/src/gpasswd.c
@@ -574,7 +574,7 @@ static void get_group (struct group *gr)
                } 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);