[Pkg-shadow-commits] r1651 - in upstream/trunk: . lib libmisc src

[nekral-guest at alioth.debian.org]

Author: nekral-guest
Date: 2008-01-05 16:44:28 +0000 (Sat, 05 Jan 2008)
New Revision: 1651

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/lib/prototypes.h
   upstream/trunk/libmisc/log.c
   upstream/trunk/src/login.c
Log:
* lib/prototypes.h: Add the dolastlog() prototype.
* lib/prototypes.h: Typo: login.c -> loginprompt.c
* src/login.c: Remove declaration of dolastlog().
* libmisc/log.c: dolastlog() should not have been changed to static.
  Include prototypes.h instead.


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2008-01-05 16:33:43 UTC (rev 1650)
+++ upstream/trunk/ChangeLog	2008-01-05 16:44:28 UTC (rev 1651)
@@ -1,5 +1,11 @@
 2008-01-05  Nicolas François  <nicolas.francois at centraliens.net>
 
+	* lib/prototypes.h: Add the dolastlog() prototype.
+	* lib/prototypes.h: Typo: login.c -> loginprompt.c
+	* src/login.c: Remove declaration of dolastlog().
+
+2008-01-05  Nicolas François  <nicolas.francois at centraliens.net>
+
 	* libmisc/pwdcheck.c: Do not include <pwd.h>. Include <shadow.h>
 	and "pwauth.h" only when compiled without PAM support.
 	* src/chfn.c, src/chsh.c: Do not include <shadow.h>
@@ -34,15 +40,13 @@
 	of the spwd structure. Replace this include by <shadow.h>
 	* libmisc/xmalloc.c, libmisc/utmp.c, libmisc/strtoday.c,
 	libmisc/pwd_init.c, libmisc/tz.c, lib/port.c, lib/fputsx.c,
-	libmisc/pam_pass.c: Include "prototypes.h" to make sure the
-	exported prototypes are the ones used for the definition of
-	functions.
+	libmisc/pam_pass.c, libmisc/log.c: Include "prototypes.h" to make
+	sure the exported prototypes are the ones used for the definition
+	of functions.
 	* libmisc/console.c: Define is_listed() as static and add its
 	prototype.
 	* libmisc/xgetXXbyYY.c, libmisc/yesno.c: Include config.h as a
 	system include, as recommended by the autoconf documentation.
-	* libmisc/log.c: Define dolastlog() as static and add its
-	prototype.
 	* src/chage.c: Define isnum() as static and add its prototype.
 	* libmisc/xgetspnam.c: Add missing include "shadowio.h". (This was
 	OK as long as prototypes.h included this file.)

Modified: upstream/trunk/lib/prototypes.h
===================================================================
--- upstream/trunk/lib/prototypes.h	2008-01-05 16:33:43 UTC (rev 1650)
+++ upstream/trunk/lib/prototypes.h	2008-01-05 16:44:28 UTC (rev 1651)
@@ -99,7 +99,13 @@
 extern int is_on_list (char *const *, const char *);
 extern char **comma_to_list (const char *);
 
-/* login.c */
+/* log.c */
+extern void dolastlog (struct lastlog *ll,
+                       const struct passwd *pw,
+                       const char *line,
+                       const char *host);
+
+/* loginprompt.c */
 extern void login_prompt (const char *, char *, int);
 
 /* mail.c */

Modified: upstream/trunk/libmisc/log.c
===================================================================
--- upstream/trunk/libmisc/log.c	2008-01-05 16:33:43 UTC (rev 1650)
+++ upstream/trunk/libmisc/log.c	2008-01-05 16:44:28 UTC (rev 1651)
@@ -37,13 +37,8 @@
 #include <time.h>
 #include "defines.h"
 #include <lastlog.h>
+#include "prototypes.h"
 
-/* local function prototypes */
-static void dolastlog (struct lastlog *ll,
-                       const struct passwd *pw,
-                       const char *line,
-                       const char *host);
-
 /* 
  * dolastlog - create lastlog entry
  *
@@ -51,7 +46,7 @@
  *	UID is extracted from the global (struct passwd) entry and the
  *	TTY information is gotten from the (struct utmp).
  */
-static void
+void
 dolastlog (struct lastlog *ll, const struct passwd *pw, const char *line,
 	   const char *host)
 {

Modified: upstream/trunk/src/login.c
===================================================================
--- upstream/trunk/src/login.c	2008-01-05 16:33:43 UTC (rev 1650)
+++ upstream/trunk/src/login.c	2008-01-05 16:44:28 UTC (rev 1651)
@@ -112,10 +112,6 @@
 
 extern char **newenvp;
 extern size_t newenvc;
-
-extern void dolastlog (struct lastlog *, const struct passwd *,
-		       const char *, const char *);
-
 extern char **environ;
 
 #ifndef	ALARM