Fix gratuitous use of strdup and x_strdup

[linux-pam] / modules / pam_unix / pam_unix_passwd.c

diff --git a/modules/pam_unix/pam_unix_passwd.c b/modules/pam_unix/pam_unix_passwd.c
index 0cfc0f4d54887bec8f901b0e793c505909ef64e5..5f3a3db395fa37a56565c7edf72b428b887a380d 100644 (file)
--- a/modules/pam_unix/pam_unix_passwd.c
+++ b/modules/pam_unix/pam_unix_passwd.c
@@ -204,7 +204,7 @@ static int _unix_run_update_binary(pam_handle_t *pamh, unsigned int ctrl, const
         int i=0;
         struct rlimit rlim;
        static char *envp[] = { NULL };
-       char *args[] = { NULL, NULL, NULL, NULL, NULL, NULL };
+       const char *args[] = { NULL, NULL, NULL, NULL, NULL, NULL };
         char buffer[16];
 
        /* XXX - should really tidy up PAM here too */
@@ -222,18 +222,18 @@ static int _unix_run_update_binary(pam_handle_t *pamh, unsigned int ctrl, const
        }
 
        /* exec binary helper */
-       args[0] = x_strdup(UPDATE_HELPER);
-       args[1] = x_strdup(user);
-       args[2] = x_strdup("update");
+       args[0] = UPDATE_HELPER;
+       args[1] = user;
+       args[2] = "update";
        if (on(UNIX_SHADOW, ctrl))
-               args[3] = x_strdup("1");
+               args[3] = "1";
        else
-               args[3] = x_strdup("0");
+               args[3] = "0";
 
         snprintf(buffer, sizeof(buffer), "%d", remember);
-        args[4] = x_strdup(buffer);
+        args[4] = buffer;
 
-       execve(UPDATE_HELPER, args, envp);
+       execve(UPDATE_HELPER, (char *const *) args, envp);
 
        /* should not get here: exit with error */
        D(("helper binary is not available"));