From: nekral-guest <nekral-guest@5a98b0ae-9ef6-0310-add3-de5d479b70d7>
Date: Sat, 11 Apr 2009 16:52:45 +0000 (+0000)
Subject: 	* src/userdel.c: Rename argv to args to avoid nameclash with the
X-Git-Tag: 4.1.3~18
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=42590e062f8090b23293e7f5630bc780484f5650;p=shadow

	* src/userdel.c: Rename argv to args to avoid nameclash with the
	main() parameters.
---

diff --git a/ChangeLog b/ChangeLog
index a4690dc7..0cd52ba3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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@centraliens.net>
 
diff --git a/src/userdel.c b/src/userdel.c
index 52a30231..9ac7a0ed 100644
--- a/src/userdel.c
+++ b/src/userdel.c
@@ -799,13 +799,13 @@ int main (int argc, char **argv)
 
 #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
 	/*