* src/userdel.c: Rename argv to args to avoid nameclash with the

	main() parameters.

diff --git a/ChangeLog b/ChangeLog
index a4690dc7fc685adbafabc20f2ac1e9948a5c8980..0cd52ba3bcdebc95126331a765d63b24789a70fe 100644 (file)
--- 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 52a302314b068da7ea2aef1b58ae97edccaaaef8..9ac7a0ed47bc654b02685e33ebc93a8003715373 100644 (file)
--- 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
        /*