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

[nekral-guest at alioth.debian.org]

Author: nekral-guest
Date: 2008-03-17 23:00:49 +0000 (Mon, 17 Mar 2008)
New Revision: 1900

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/src/grpck.c
Log:
Fix some warnings. compare_members_lists() is only used if SHADOWGRP is defined.


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2008-03-09 01:59:59 UTC (rev 1899)
+++ upstream/trunk/ChangeLog	2008-03-17 23:00:49 UTC (rev 1900)
@@ -1,3 +1,8 @@
+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.
+
 2008-03-08  Nicolas François  <nicolas.francois at centraliens.net>
 
 	* NEWS, src/groupmod.c: Make sure the passwd, group, and gshadow

Modified: upstream/trunk/src/grpck.c
===================================================================
--- upstream/trunk/src/grpck.c	2008-03-09 01:59:59 UTC (rev 1899)
+++ upstream/trunk/src/grpck.c	2008-03-17 23:00:49 UTC (rev 1900)
@@ -85,13 +85,13 @@
                           const char *fmt_prompt,
                           const char *fmt_syslog,
                           int *errors);
+static void check_grp_file (int *errors, int *changed);
+#ifdef SHADOWGRP
 static void compare_members_lists (const char *groupname,
                                    char **members,
                                    char **other_members,
                                    const char *file,
                                    const char *other_file);
-static void check_grp_file (int *errors, int *changed);
-#ifdef SHADOWGRP
 static void check_sgr_file (int *errors, int *changed);
 #endif
 
@@ -350,6 +350,7 @@
 	return members_changed;
 }
 
+#ifdef SHADOWGRP
 /*
  * compare_members_lists - make sure the list of members is contained in
  *                         another list.
@@ -381,6 +382,7 @@
 		}
 	}
 }
+#endif				/* SHADOWGRP */
 
 /*
  * check_grp_file - check the content of the group file