login_prompt is the name of a function, use loginprompt for the internal variable.

diff --git a/ChangeLog b/ChangeLog
index a81911fa820cc273801af82eb4c858bd0ac7cddf..0d2a3ecb18429ec3d797052225a90fafac4ec92b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -21,6 +21,8 @@
        OK as long as prototypes.h included this file.)
        * src/nologin.c: Make a proper prototype for the main() function
        declaration. (add void)
+       * src/login.c: login_prompt is the name of a function, use
+       loginprompt for the internal variable.
 
 2008-01-01  Nicolas François  <nicolas.francois@centraliens.net>
 

diff --git a/src/login.c b/src/login.c
index e08f448ca7bc90833a288a0e076705c116d6e940..2a58c0c6d565fa03566ad9c80afb26a88ce6ac6f 100644 (file)
--- a/src/login.c
+++ b/src/login.c
@@ -608,19 +608,19 @@ int main (int argc, char **argv)
                if (!fflg || (getuid () != 0)) {
                        int failcount = 0;
                        char hostn[256];
-                       char login_prompt[256]; /* That's one hell of a prompt :) */
+                       char loginprompt[256];  /* That's one hell of a prompt :) */
 
                        /* Make the login prompt look like we want it */
                        if (!gethostname (hostn, sizeof (hostn)))
-                               snprintf (login_prompt,
-                                         sizeof (login_prompt),
+                               snprintf (loginprompt,
+                                         sizeof (loginprompt),
                                          _("%s login: "), hostn);
                        else
-                               snprintf (login_prompt,
-                                         sizeof (login_prompt), _("login: "));
+                               snprintf (loginprompt,
+                                         sizeof (loginprompt), _("login: "));
 
                        retcode =
-                           pam_set_item (pamh, PAM_USER_PROMPT, login_prompt);
+                           pam_set_item (pamh, PAM_USER_PROMPT, loginprompt);
                        PAM_FAIL_CHECK;
 
                        /* if we didn't get a user on the command line,