emo/shadow
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

* libmisc/limits.c: Fix the format to match the unsigned long

Browse Source 
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.
This commit is contained in:
nekral-guest 2009-09-07 19:50:00 +00:00
parent 2a58111fc1
commit 031279dfb2
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2009-09-07 Steve Grubb <sgrubb@redhat.com>
* 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 <nicolas.francois@centraliens.net> 2009-09-07 Nicolas François <nicolas.francois@centraliens.net>
* lib/shadowmem.c: Only copy the required fields of the struct * lib/shadowmem.c: Only copy the required fields of the struct

5
libmisc/limits.c
View File

@ -167,8 +167,9 @@ static int check_logins (const char *name, const char *maxlogins)
* includes the user who is currently trying to log in. * includes the user who is currently trying to log in.
*/ */
if (count > limit) { if (count > limit) {
SYSLOG ((LOG_WARN, "Too many logins (max %d) for %s\n", SYSLOG ((LOG_WARN,
limit, name)); "Too many logins (max %lu) for %s\n",
limit, name));
return LOGIN_ERROR_LOGIN; return LOGIN_ERROR_LOGIN;
} }
return 0; return 0;

3
libmisc/utmp.c
View File

@ -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.")); (void) puts (_("Unable to determine your tty name."));
exit (EXIT_FAILURE); exit (EXIT_FAILURE);
} else if (strncmp (tty, tmptty, sizeof (tmptty)) != 0) { } 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); strcpy (hostname, host);
#ifdef HAVE_STRUCT_UTMP_UT_HOST #ifdef HAVE_STRUCT_UTMP_UT_HOST
} else if ( (NULL != ut) } else if ( (NULL != ut)
&& (NULL != ut->ut_host)
&& ('\0' != ut->ut_host[0])) { && ('\0' != ut->ut_host[0])) {
hostname = (char *) xmalloc (sizeof (ut->ut_host) + 1); hostname = (char *) xmalloc (sizeof (ut->ut_host) + 1);
strncpy (hostname, ut->ut_host, sizeof (ut->ut_host)); strncpy (hostname, ut->ut_host, sizeof (ut->ut_host));