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

[Nicolas FRANÇOIS]

Author: nekral-guest
Date: 2009-04-11 16:52:45 +0000 (Sat, 11 Apr 2009)
New Revision: 2649

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/src/userdel.c
Log:
	* src/userdel.c: Rename argv to args to avoid nameclash with the
	main() parameters.


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2009-04-11 16:47:32 UTC (rev 2648)
+++ upstream/trunk/ChangeLog	2009-04-11 16:52:45 UTC (rev 2649)
@@ -2,6 +2,8 @@
 
 	* src/useradd.c, src/usermod.c: Only call selinux_update_mapping()
 	if Zflg is set.
+	* src/userdel.c: Rename argv to args to avoid nameclash with the
+	main() parameters.
 
 2009-04-11  Nicolas François  <nicolas.francois at centraliens.net>
 

Modified: upstream/trunk/src/userdel.c
===================================================================
--- upstream/trunk/src/userdel.c	2009-04-11 16:47:32 UTC (rev 2648)
+++ upstream/trunk/src/userdel.c	2009-04-11 16:52:45 UTC (rev 2649)
@@ -799,13 +799,13 @@
 
 #ifdef WITH_SELINUX
 	if (is_selinux_enabled () > 0) {
-		const char *argv[5];
-		argv[0] = "/usr/sbin/semanage";
-		argv[1] = "login";
-		argv[2] = "-d";
-		argv[3] = user_name;
-		argv[4] = NULL;
-		safe_system (argv[0], argv, NULL, 1);
+		const char *args[5];
+		args[0] = "/usr/sbin/semanage";
+		args[1] = "login";
+		args[2] = "-d";
+		args[3] = user_name;
+		args[4] = NULL;
+		safe_system (args[0], args, NULL, 1);
 	}
 #endif
 	/*