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

[nekral-guest at alioth.debian.org]

Author: nekral-guest
Date: 2008-08-31 17:28:21 +0000 (Sun, 31 Aug 2008)
New Revision: 2317

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/src/grpunconv.c
Log:
	* src/grpunconv.c: Fail if unexpected parameters
	are provided.
	* src/grpunconv.c: Indicate that argc is not used
	in the no SHADOWGRP version.

Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2008-08-31 17:28:12 UTC (rev 2316)
+++ upstream/trunk/ChangeLog	2008-08-31 17:28:21 UTC (rev 2317)
@@ -2,9 +2,10 @@
 
 	* src/grpconv.c, src/groups.c: Name the parameters in the
 	prototypes of the static functions.
-	* src/grpconv.c: Fail if unexpected parameters are provided.
-	* src/grpconv.c: Indicate that argc is not used in the no
-	SHADOWGRP version.
+	* src/grpconv.c, src/grpunconv.c: Fail if unexpected parameters
+	are provided.
+	* src/grpconv.c, src/grpunconv.c: Indicate that argc is not used
+	in the no SHADOWGRP version.
 
 2008-08-28  Nicolas François  <nicolas.francois at centraliens.net>
 

Modified: upstream/trunk/src/grpunconv.c
===================================================================
--- upstream/trunk/src/grpunconv.c	2008-08-31 17:28:12 UTC (rev 2316)
+++ upstream/trunk/src/grpunconv.c	2008-08-31 17:28:21 UTC (rev 2317)
@@ -88,6 +88,9 @@
 	struct group grent;
 	const struct sgrp *sg;
 
+	if (1 != argc) {
+		(void) fputs (_("Usage: grpunconv\n"), stderr);
+	}
 	Prog = Basename (argv[0]);
 
 	(void) setlocale (LC_ALL, "");
@@ -187,7 +190,7 @@
 	return 0;
 }
 #else				/* !SHADOWGRP */
-int main (int argc, char **argv)
+int main (int unused(argc), char **argv)
 {
 	fprintf (stderr,
 		 "%s: not configured for shadow group support.\n", argv[0]);