[Pkg-shadow-commits] r2820 - in upstream/trunk: . lib libmisc
Nicolas FRANÇOIS
nekral-guest at alioth.debian.org
Mon Apr 27 20:15:09 UTC 2009
Author: nekral-guest
Date: 2009-04-27 20:15:09 +0000 (Mon, 27 Apr 2009)
New Revision: 2820
Modified:
upstream/trunk/ChangeLog
upstream/trunk/lib/prototypes.h
upstream/trunk/libmisc/log.c
Log:
* lib/prototypes.h: Replace HAVE_UTMPX_H by USE_UTMPX.
* lib/prototypes.h, libmisc/log.c: Added splint annotations.
* libmisc/log.c: Added SYSLOG warning when lseek fails (should not
happen).
Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog 2009-04-27 20:09:18 UTC (rev 2819)
+++ upstream/trunk/ChangeLog 2009-04-27 20:15:09 UTC (rev 2820)
@@ -1,5 +1,12 @@
2009-04-27 Nicolas François <nicolas.francois at centraliens.net>
+ * lib/prototypes.h: Replace HAVE_UTMPX_H by USE_UTMPX.
+ * lib/prototypes.h, libmisc/log.c: Added splint annotations.
+ * libmisc/log.c: Added SYSLOG warning when lseek fails (should not
+ happen).
+
+2009-04-27 Nicolas François <nicolas.francois at centraliens.net>
+
* libmisc/mail.c, libmisc/copydir.c: Added missing include of
<assert.h>
Modified: upstream/trunk/lib/prototypes.h
===================================================================
--- upstream/trunk/lib/prototypes.h 2009-04-27 20:09:18 UTC (rev 2819)
+++ upstream/trunk/lib/prototypes.h 2009-04-27 20:15:09 UTC (rev 2820)
@@ -43,7 +43,7 @@
#define _PROTOTYPES_H
#include <sys/stat.h>
-#if HAVE_UTMPX_H
+#if USE_UTMPX
#include <utmpx.h>
#else
#include <utmp.h>
@@ -217,10 +217,11 @@
extern /*@only@*/char **comma_to_list (const char *);
/* log.c */
-extern void dolastlog (struct lastlog *ll,
- const struct passwd *pw,
- const char *line,
- const char *host);
+extern void dolastlog (
+ struct lastlog *ll,
+ const struct passwd *pw,
+ /*@unique@*/const char *line,
+ /*@unique@*/const char *host);
/* login_nopam.c */
extern int login_access (const char *user, const char *from);
@@ -362,13 +363,13 @@
const char *host,
/*@null@*/const struct utmp *ut);
extern int setutmp (struct utmp *ut);
-#ifdef HAVE_UTMPX_H
+#ifdef USE_UTMPX
extern struct utmpx *prepare_utmpx (const char *name,
const char *line,
const char *host,
/*@null@*/const struct utmp *ut);
extern int setutmpx (struct utmpx *utx);
-#endif
+#endif /* USE_UTMPX */
/* valid.c */
extern bool valid (const char *, const struct passwd *);
Modified: upstream/trunk/libmisc/log.c
===================================================================
--- upstream/trunk/libmisc/log.c 2009-04-27 20:09:18 UTC (rev 2819)
+++ upstream/trunk/libmisc/log.c 2009-04-27 20:15:09 UTC (rev 2820)
@@ -49,9 +49,11 @@
* UID is extracted from the global (struct passwd) entry and the
* TTY information is gotten from the (struct utmp).
*/
-void
-dolastlog (struct lastlog *ll, const struct passwd *pw, const char *line,
- const char *host)
+void dolastlog (
+ struct lastlog *ll,
+ const struct passwd *pw,
+ /*@unique@*/const char *line,
+ /*@unique@*/const char *host)
{
int fd;
off_t offset;
@@ -75,7 +77,10 @@
offset = (off_t) pw->pw_uid * sizeof newlog;
if (lseek (fd, offset, SEEK_SET) != offset) {
- close (fd);
+ SYSLOG ((LOG_WARN,
+ "Can't read last lastlog entry for UID %lu in %s. Entry not updated.",
+ (unsigned long) pw->pw_uid, LASTLOG_FILE));
+ (void) close (fd);
return;
}
More information about the Pkg-shadow-commits
mailing list