diff --git a/ChangeLog b/ChangeLog
index 9153b726b3..ca19c80427 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2000-12-05  H.J. Lu  <hjl@gnu.org>
+
+	* nss/getXXent_r.c (setup): Change the return type to int.
+
 2000-12-05  Ulrich Drepper  <drepper@redhat.com>
 
 	* sysdeps/unix/sysv/aix/Makefile [$(subdir)==misc]
diff --git a/nss/getXXent_r.c b/nss/getXXent_r.c
index a5a5200f00..f27683a420 100644
--- a/nss/getXXent_r.c
+++ b/nss/getXXent_r.c
@@ -123,7 +123,7 @@ extern int DB_LOOKUP_FCT (service_user **nip, const char *name, void **fctp);
 /* Set up NIP to run through the services.  If ALL is zero, use NIP's
    current location if it's not nil.  Return nonzero if there are no
    services (left).  */
-static enum nss_status
+static int
 setup (void **fctp, const char *func_name, int all)
 {
   int no_more;