diff --git a/ChangeLog b/ChangeLog
index 56aedfe6..9769a673 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-06-13  Nicolas François  <nicolas.francois@centraliens.net>
+
+	* lib/prototypes.h: Define AUDIT_NO_ID to (unsigned int) -1. This
+	value should be used when the ID should not be considered.
+	* lib/prototypes.h: Fix the prototype of do_rlogin() according to
+	earlier changes.
+
 2008-06-13  Nicolas François  <nicolas.francois@centraliens.net>
 
 	* lib/shadow.c: Use SHADOW_SP_FLAG_UNSET for the initial
diff --git a/lib/prototypes.h b/lib/prototypes.h
index c275ba41..f4651e76 100644
--- a/lib/prototypes.h
+++ b/lib/prototypes.h
@@ -126,8 +126,10 @@ extern bool hushed (const struct passwd *pw);
 #ifdef WITH_AUDIT
 extern int audit_fd;
 extern void audit_help_open (void);
+/* Use AUDIT_NO_ID when a name is provided to audit_logger instead of an ID */
+#define AUDIT_NO_ID	((unsigned int) -1)
 extern void audit_logger (int type, const char *pgname, const char *op,
-			  const char *name, unsigned int id, int result);
+                          const char *name, unsigned int id, int result);
 #endif
 
 /* limits.c */
@@ -188,7 +190,8 @@ extern struct commonio_entry *__pw_get_head (void);
 extern struct passwd *__pw_dup (const struct passwd *pwent);
 
 /* rlogin.c */
-extern int do_rlogin (const char *, char *, int, char *, int);
+extern int do_rlogin (const char *remote_host, char *name, size_t namelen,
+                      char *term, size_t termlen);
 
 /* salt.c */
 extern char *crypt_make_salt (const char *meth, void *arg);