* src/useradd.c: If the faillog file exist, warn in case of

failure when open(), lssek(), write() or close() fails when the
	new user's faillog entry is reset.
	* src/useradd.c: Ditto for the lastlog entry.
This commit is contained in:
nekral-guest 2008-06-15 22:25:51 +00:00
parent abb95d5aab
commit ca032792bd
2 changed files with 35 additions and 10 deletions

View File

@ -1,3 +1,10 @@
2008-06-16 Nicolas François <nicolas.francois@centraliens.net>
* src/useradd.c: If the faillog file exist, warn in case of
failure when open(), lssek(), write() or close() fails when the
new user's faillog entry is reset.
* src/useradd.c: Ditto for the lastlog entry.
2008-06-15 Nicolas François <nicolas.francois@centraliens.net> 2008-06-15 Nicolas François <nicolas.francois@centraliens.net>
* libmisc/limits.c: Add brackets and parenthesis. * libmisc/limits.c: Add brackets and parenthesis.

View File

@ -1403,13 +1403,22 @@ static void faillog_reset (uid_t uid)
{ {
struct faillog fl; struct faillog fl;
int fd; int fd;
off_t offset_uid = (off_t) (sizeof fl) * uid;
if (access (FAILLOG_FILE, F_OK) != 0) {
return;
}
memzero (&fl, sizeof (fl));
fd = open (FAILLOG_FILE, O_RDWR); fd = open (FAILLOG_FILE, O_RDWR);
if (fd >= 0) { if ( (-1 == fd)
memzero (&fl, sizeof (fl)); || (lseek (fd, offset_uid, SEEK_SET) != offset_uid)
lseek (fd, (off_t) sizeof (fl) * uid, SEEK_SET); || (write (fd, &fl, sizeof (fl)) != (ssize_t) sizeof (fl))
write (fd, &fl, sizeof (fl)); || (close (fd) != 0)) {
close (fd); fprintf (stderr,
_("%s: failed to reset the faillog entry of UID %lu: %s\n"),
Prog, (unsigned long) uid, strerror(errno));
} }
} }
@ -1417,13 +1426,22 @@ static void lastlog_reset (uid_t uid)
{ {
struct lastlog ll; struct lastlog ll;
int fd; int fd;
off_t offset_uid = (off_t) (sizeof ll) * uid;
if (access (LASTLOG_FILE, F_OK) != 0) {
return;
}
memzero (&ll, sizeof (ll));
fd = open (LASTLOG_FILE, O_RDWR); fd = open (LASTLOG_FILE, O_RDWR);
if (fd >= 0) { if ( (-1 == fd)
memzero (&ll, sizeof (ll)); || (lseek (fd, offset_uid, SEEK_SET) != offset_uid)
lseek (fd, (off_t) sizeof (ll) * uid, SEEK_SET); || (write (fd, &ll, sizeof (ll)) != (ssize_t) sizeof (ll))
write (fd, &ll, sizeof (ll)); || (close (fd) != 0)) {
close (fd); fprintf (stderr,
_("%s: failed to reset the lastlog entry of UID %lu: %s\n"),
Prog, (unsigned long) uid, strerror(errno));
} }
} }