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

[Nicolas FRANÇOIS]

Author: nekral-guest
Date: 2011-11-19 14:27:48 +0000 (Sat, 19 Nov 2011)
New Revision: 3632

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/src/gpasswd.c
Log:
	* src/gpasswd.c: Change of group password enforces gshadow
	password. Set /etc/group password to "x".


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2011-11-19 14:20:52 UTC (rev 3631)
+++ upstream/trunk/ChangeLog	2011-11-19 14:27:48 UTC (rev 3632)
@@ -1,3 +1,8 @@
+2011-11-16  Nicolas François  <nicolas.francois at centraliens.net>
+
+	* src/gpasswd.c: Change of group password enforces gshadow
+	password. Set /etc/group password to "x".
+
 2011-11-16  Peter Vrabec  <pvrabec at redhat.com>
 
 	* NEWS, src/userdel.c, man/userdel.8.xml: Add option -Z/--selinux-user.

Modified: upstream/trunk/src/gpasswd.c
===================================================================
--- upstream/trunk/src/gpasswd.c	2011-11-19 14:20:52 UTC (rev 3631)
+++ upstream/trunk/src/gpasswd.c	2011-11-19 14:27:48 UTC (rev 3632)
@@ -941,6 +941,7 @@
 	memzero (pass, sizeof pass);
 #ifdef SHADOWGRP
 	if (is_shadowgrp) {
+		gr->gr_passwd = SHADOW_PASSWD_STRING;
 		sg->sg_passwd = cp;
 	} else
 #endif
@@ -1041,20 +1042,30 @@
 	 * field to a "".
 	 */
 	if (rflg) {
-		grent.gr_passwd = "";	/* XXX warning: const */
 #ifdef SHADOWGRP
-		sgent.sg_passwd = "";	/* XXX warning: const */
-#endif
+		if (is_shadowgrp) {
+			grent.gr_passwd = SHADOW_PASSWD_STRING;	/* XXX warning: const */
+			sgent.sg_passwd = "";	/* XXX warning: const */
+		} else
+#endif				/* SHADOWGRP */
+		{
+			grent.gr_passwd = "";	/* XXX warning: const */
+		}
 		goto output;
 	} else if (Rflg) {
 		/*
 		 * Same thing for restricting the group. Set the password
 		 * field to "!".
 		 */
-		grent.gr_passwd = "!";	/* XXX warning: const */
 #ifdef SHADOWGRP
-		sgent.sg_passwd = "!";	/* XXX warning: const */
-#endif
+		if (is_shadowgrp) {
+			grent.gr_passwd = SHADOW_PASSWD_STRING;	/* XXX warning: const */
+			sgent.sg_passwd = "!";	/* XXX warning: const */
+		} else
+#endif				/* SHADOWGRP */
+		{
+			grent.gr_passwd = "!";	/* XXX warning: const */
+		}
 		goto output;
 	}