[Pkg-shadow-commits] r1659 - in upstream/trunk: . src

[nekral-guest at alioth.debian.org]

Author: nekral-guest
Date: 2008-01-06 12:07:42 +0000 (Sun, 06 Jan 2008)
New Revision: 1659

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/src/login_nopam.c
Log:
* src/login_nopam.c: Use an ANSI prototype for resolve_hostname()
  instead of K&R prototype.
* src/login_nopam.c: Fix the prototypes of list_match(),
  user_match(), from_match(), string_match(). There were no
  parameters in the prototypes.
* src/login_nopam.c: Fix the prototypes of the function parameter
  match_fn of list_match().


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2008-01-06 12:02:24 UTC (rev 1658)
+++ upstream/trunk/ChangeLog	2008-01-06 12:07:42 UTC (rev 1659)
@@ -1,5 +1,15 @@
 2008-01-06  Nicolas François  <nicolas.francois at centraliens.net>
 
+	* src/login_nopam.c: Use an ANSI prototype for resolve_hostname()
+	instead of K&R prototype.
+	* src/login_nopam.c: Fix the prototypes of list_match(),
+	user_match(), from_match(), string_match(). There were no
+	parameters in the prototypes.
+	* src/login_nopam.c: Fix the prototypes of the function parameter
+	match_fn of list_match().
+
+2008-01-06  Nicolas François  <nicolas.francois at centraliens.net>
+
 	* libmisc/copydir.c: Remove the src parameter of copy_special().
 	The entry's information are taken from the stat structure.
 

Modified: upstream/trunk/src/login_nopam.c
===================================================================
--- upstream/trunk/src/login_nopam.c	2008-01-06 12:02:24 UTC (rev 1658)
+++ upstream/trunk/src/login_nopam.c	2008-01-06 12:07:42 UTC (rev 1659)
@@ -58,7 +58,6 @@
 #endif
 
  /* Path name of the access control file. */
-
 #ifndef	TABLE
 #define TABLE	"/etc/login.access"
 #endif
@@ -71,10 +70,11 @@
 #define YES             1
 #define NO              0
 
-static int list_match ();
-static int user_match ();
-static int from_match ();
-static int string_match ();
+static int list_match (char *list, const char *item, int (*match_fn) (const char *, const char *));
+static int user_match (const char *tok, const char *string);
+static int from_match (const char *tok, const char *string);
+static int string_match (const char *tok, const char *string);
+static const char *resolve_hostname (const char *string);
 
 /* login_access - match username/group and host/tty with access control file */
 int login_access (const char *user, const char *from)
@@ -137,7 +137,7 @@
 }
 
 /* list_match - match an item against a list of tokens with exceptions */
-static int list_match (char *list, const char *item, int (*match_fn) ())
+static int list_match (char *list, const char *item, int (*match_fn) (const char *, const char*))
 {
 	char *tok;
 	int match = NO;
@@ -245,8 +245,7 @@
 	return (NO);
 }
 
-static const char *resolve_hostname (string)
-const char *string;
+static const char *resolve_hostname (const char *string)
 {
 	/*
 	 * Resolve hostname to numeric IP address, as suggested