From 031279dfb268be2032babeedf4c8aec807f3f21e Mon Sep 17 00:00:00 2001 From: nekral-guest Date: Mon, 7 Sep 2009 19:50:00 +0000 Subject: [PATCH] * libmisc/limits.c: Fix the format to match the unsigned long variable in argument. * libmisc/utmp.c: Fix tests. tmptty is a variable stack. ut_host is an array of the ut structure. None of them can be NULL. --- ChangeLog | 7 +++++++ libmisc/limits.c | 5 +++-- libmisc/utmp.c | 3 +-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index befe7550..bee9c2c9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2009-09-07 Steve Grubb + + * libmisc/limits.c: Fix the format to match the unsigned long + variable in argument. + * libmisc/utmp.c: Fix tests. tmptty is a variable stack. ut_host + is an array of the ut structure. None of them can be NULL. + 2009-09-07 Nicolas François * lib/shadowmem.c: Only copy the required fields of the struct diff --git a/libmisc/limits.c b/libmisc/limits.c index 0eb2c494..bfcce52e 100644 --- a/libmisc/limits.c +++ b/libmisc/limits.c @@ -167,8 +167,9 @@ static int check_logins (const char *name, const char *maxlogins) * includes the user who is currently trying to log in. */ if (count > limit) { - SYSLOG ((LOG_WARN, "Too many logins (max %d) for %s\n", - limit, name)); + SYSLOG ((LOG_WARN, + "Too many logins (max %lu) for %s\n", + limit, name)); return LOGIN_ERROR_LOGIN; } return 0; diff --git a/libmisc/utmp.c b/libmisc/utmp.c index 976396d6..271aaa44 100644 --- a/libmisc/utmp.c +++ b/libmisc/utmp.c @@ -71,7 +71,7 @@ static bool is_my_tty (const char *tty) } } - if (NULL == tmptty) { + if ('\0' == tmptty[0]) { (void) puts (_("Unable to determine your tty name.")); exit (EXIT_FAILURE); } else if (strncmp (tty, tmptty, sizeof (tmptty)) != 0) { @@ -200,7 +200,6 @@ static void updwtmpx (const char *filename, const struct utmpx *utx) strcpy (hostname, host); #ifdef HAVE_STRUCT_UTMP_UT_HOST } else if ( (NULL != ut) - && (NULL != ut->ut_host) && ('\0' != ut->ut_host[0])) { hostname = (char *) xmalloc (sizeof (ut->ut_host) + 1); strncpy (hostname, ut->ut_host, sizeof (ut->ut_host));