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

[nekral-guest at alioth.debian.org]

Author: nekral-guest
Date: 2008-03-17 23:02:23 +0000 (Mon, 17 Mar 2008)
New Revision: 1901

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/src/gpasswd.c
   upstream/trunk/src/groupmod.c
Log:
Compilation fix. gshadow_locked should only be used if SHADOWGRP is defined.


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2008-03-17 23:00:49 UTC (rev 1900)
+++ upstream/trunk/ChangeLog	2008-03-17 23:02:23 UTC (rev 1901)
@@ -1,5 +1,10 @@
 2008-03-17  Nicolas François  <nicolas.francois at centraliens.net>
 
+	* src/gpasswd.c, src/groupmod.c: Compilation fix. gshadow_locked
+	should only be used if SHADOWGRP is defined.
+
+2008-03-17  Nicolas François  <nicolas.francois at centraliens.net>
+
 	* src/grpck.c: Fix some warnings. compare_members_lists() is only
 	used if SHADOWGRP is defined.
 

Modified: upstream/trunk/src/gpasswd.c
===================================================================
--- upstream/trunk/src/gpasswd.c	2008-03-17 23:00:49 UTC (rev 1900)
+++ upstream/trunk/src/gpasswd.c	2008-03-17 23:02:23 UTC (rev 1901)
@@ -156,9 +156,11 @@
 	if (group_locked) {
 		gr_unlock ();
 	}
+#ifdef SHADOWGRP
 	if (gshadow_locked) {
 		sgr_unlock ();
 	}
+#endif
 
 	exit (status);
 }

Modified: upstream/trunk/src/groupmod.c
===================================================================
--- upstream/trunk/src/groupmod.c	2008-03-17 23:00:49 UTC (rev 1900)
+++ upstream/trunk/src/groupmod.c	2008-03-17 23:02:23 UTC (rev 1901)
@@ -66,7 +66,7 @@
 #ifdef	SHADOWGRP
 static int is_shadow_grp;
 static int gshadow_locked = 0;
-#endif
+#endif				/* SHADOWGRP */
 static int group_locked = 0;
 static int passwd_locked = 0;
 static char *group_name;
@@ -123,9 +123,11 @@
 	if (group_locked) {
 		gr_unlock ();
 	}
+#ifdef	SHADOWGRP
 	if (gshadow_locked) {
 		sgr_unlock ();
 	}
+#endif				/* SHADOWGRP */
 	if (passwd_locked) {
 		pw_unlock();
 	}