From 7e398a169b4484583e01ccfda00e6e10713ce43d Mon Sep 17 00:00:00 2001 From: nekral-guest Date: Sat, 21 Aug 2010 20:37:23 +0000 Subject: [PATCH] * src/sulogin.c: Fix a const issue. --- ChangeLog | 1 + src/sulogin.c | 15 ++++++++------- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 815579cf..8fcc3c7e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ * src/passwd.c: Fix a const issue. * src/passwd.c: Avoid multi-statements lines. + * src/sulogin.c: Fix a const issue. 2010-08-21 Nicolas François diff --git a/src/sulogin.c b/src/sulogin.c index 33955512..22c23bd7 100644 --- a/src/sulogin.c +++ b/src/sulogin.c @@ -80,7 +80,7 @@ static RETSIGTYPE catch_signals (unused int sig) /*ARGSUSED*/ int main (int argc, char **argv) { - char *cp; + const char *env; char **envp = environ; TERMIO termio; int err = 0; @@ -162,13 +162,13 @@ static RETSIGTYPE catch_signals (unused int sig) #ifndef USE_PAM - cp = getdef_str ("ENV_TZ"); - if (NULL != cp) { - addenv (('/' == *cp) ? tz (cp) : cp, NULL); + env = getdef_str ("ENV_TZ"); + if (NULL != env) { + addenv (('/' == *env) ? tz (env) : env, NULL); } - cp = getdef_str ("ENV_HZ"); - if (NULL != cp) { - addenv (cp, NULL); /* set the default $HZ, if one */ + env = getdef_str ("ENV_HZ"); + if (NULL != env) { + addenv (env, NULL); /* set the default $HZ, if one */ } #endif /* !USE_PAM */ @@ -178,6 +178,7 @@ static RETSIGTYPE catch_signals (unused int sig) (void) alarm (ALARM); /* only wait so long ... */ while (true) { /* repeatedly get login/password pairs */ + char *cp; pw_entry (name, &pwent); /* get entry from password file */ if (pwent.pw_name == (char *) 0) { /*