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

* libmisc/failure.c: Avoid assignments in comparisons.

Browse Source 
* libmisc/failure.c: read() returns a ssize_t.
	* libmisc/failure.c: Add brackets and parenthesis.
	* libmisc/failure.c: Ignore return value of time() when use with a
	non NULL argument.
This commit is contained in:
nekral-guest 2008-06-13 18:31:13 +00:00
parent 1e798b640d
commit 2296db3db6
2 changed files with 34 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2008-06-13 Nicolas François <nicolas.francois@centraliens.net>
* libmisc/failure.c: Avoid assignments in comparisons.
* libmisc/failure.c: read() returns a ssize_t.
* libmisc/failure.c: Add brackets and parenthesis.
* libmisc/failure.c: Ignore return value of time() when use with a
non NULL argument.
2008-06-13 Nicolas François <nicolas.francois@centraliens.net> 2008-06-13 Nicolas François <nicolas.francois@centraliens.net>
* libmisc/chowntty.c: Avoid assignments in comparisons. * libmisc/chowntty.c: Avoid assignments in comparisons.

40
libmisc/failure.c
View File

@ -55,8 +55,10 @@ void failure (uid_t uid, const char *tty, struct faillog *fl)
* Don't do anything if failure logging isn't set up. * Don't do anything if failure logging isn't set up.
*/ */
/* TODO: check if the file exists */ /* TODO: check if the file exists */
if ((fd = open (FAILLOG_FILE, O_RDWR)) < 0) fd = open (FAILLOG_FILE, O_RDWR);
if (fd < 0) {
return; return;
}
/* /*
* The file is indexed by UID value meaning that shared UID's * The file is indexed by UID value meaning that shared UID's
@ -65,8 +67,10 @@ void failure (uid_t uid, const char *tty, struct faillog *fl)
*/ */
lseek (fd, (off_t) (sizeof *fl) * uid, SEEK_SET); lseek (fd, (off_t) (sizeof *fl) * uid, SEEK_SET);
if (read (fd, (char *) fl, sizeof *fl) != sizeof *fl) /* TODO: check failures */
if (read (fd, (char *) fl, sizeof *fl) != (ssize_t) sizeof *fl) {
memzero (fl, sizeof *fl); memzero (fl, sizeof *fl);
}
/* /*
* Update the record. We increment the failure count to log the * Update the record. We increment the failure count to log the
@ -75,11 +79,12 @@ void failure (uid_t uid, const char *tty, struct faillog *fl)
* updated as well. * updated as well.
*/ */
if (fl->fail_cnt + 1 > 0) if (fl->fail_cnt + 1 > 0) {
fl->fail_cnt++; fl->fail_cnt++;
}
strncpy (fl->fail_line, tty, sizeof fl->fail_line); strncpy (fl->fail_line, tty, sizeof fl->fail_line);
time (&fl->fail_time); (void) time (&fl->fail_time);
/* /*
* Seek back to the correct position in the file and write the * Seek back to the correct position in the file and write the
@ -100,15 +105,18 @@ static bool too_many_failures (const struct faillog *fl)
{ {
time_t now; time_t now;
if (fl->fail_max == 0 || fl->fail_cnt < fl->fail_max) if ((0 == fl->fail_max) || (fl->fail_cnt < fl->fail_max)) {
return false; return false;
}
if (fl->fail_locktime == 0) if (0 == fl->fail_locktime) {
return true; /* locked until reset manually */ return true; /* locked until reset manually */
}
time (&now); (void) time (&now);
if (fl->fail_time + fl->fail_locktime < now) if ((fl->fail_time + fl->fail_locktime) < now) {
return false; /* enough time since last failure */ return false; /* enough time since last failure */
}
return true; return true;
} }
@ -153,7 +161,7 @@ int failcheck (uid_t uid, struct faillog *fl, bool failed)
*/ */
lseek (fd, (off_t) (sizeof *fl) * uid, SEEK_SET); lseek (fd, (off_t) (sizeof *fl) * uid, SEEK_SET);
if (read (fd, (char *) fl, sizeof *fl) != sizeof *fl) { if (read (fd, (char *) fl, sizeof *fl) != (ssize_t) sizeof *fl) {
close (fd); close (fd);
return 1; return 1;
} }
@ -200,11 +208,12 @@ void failprint (const struct faillog *fail)
#endif #endif
time_t NOW; time_t NOW;
if (fail->fail_cnt == 0) if (0 == fail->fail_cnt) {
return; return;
}
tp = localtime (&(fail->fail_time)); tp = localtime (&(fail->fail_time));
time (&NOW); (void) time (&NOW);
#if HAVE_STRFTIME #if HAVE_STRFTIME
/* /*
@ -220,13 +229,16 @@ void failprint (const struct faillog *fail)
lasttime = asctime (tp); lasttime = asctime (tp);
lasttime[24] = '\0'; lasttime[24] = '\0';
if (NOW - fail->fail_time < YEAR) if ((NOW - fail->fail_time) < YEAR) {
lasttime[19] = '\0'; lasttime[19] = '\0';
if (NOW - fail->fail_time < DAY) }
if ((NOW - fail->fail_time) < DAY) {
lasttime = lasttime + 11; lasttime = lasttime + 11;
}
if (*lasttime == ' ') if (' ' == *lasttime) {
lasttime++; lasttime++;
}
#endif #endif
printf (ngettext ("%d failure since last login.\n" printf (ngettext ("%d failure since last login.\n"
"Last was %s on %s.\n", "Last was %s on %s.\n",