From b677d6742888747613ebb4dbe4bbb4dbe6e07087 Mon Sep 17 00:00:00 2001
From: Ulrich Drepper <drepper@redhat.com>
Date: Sun, 19 Jan 2003 19:22:02 +0000
Subject: Update.

2003-01-19  Ulrich Drepper  <drepper@redhat.com>

	* nis/nss_nis/nis-spwd.c: Make _nss_nis_endspent an alias of
	_nss_nis_setspent.  Work around the different prototypes.
	* nis/nss_nis/nis-rpc.c (internal_nis_setrpcent): Use
	internal_nis_endrpcent.
	(internal_nis_endrpcent): Change return type to void.  Change callers.
	* nis/nss_nis/nis-pwd.c: Make _nss_nis_endpwent an alias of
	_nss_nis_setpwent.  Work around the different prototypes.
	* nis/nss_nis/nis-proto.c (_nss_nis_endprotoent): Split out body
	of the function to...
	(internal_nis_endprotoent): ... here.  New function.
	(internal_nis_setprotoent): Use internal_nis_endprotoent.
	* nis/nss_nis/nis-network.c: Make _nss_nis_endnetent an alias of
	_nss_nis_setnetent.  Work around the different prototypes.
	* nis/nss_nis/nis-netgrp.c (_nss_nis_endnetgrent): Split out body
	of the function to...
	(internal_nis_endnetgrent): ... here.  New function.
	(_nss_nis_setnetgrent): Use internal_nis_endnetgrent.
---
 nis/nss_nis/nis-spwd.c | 37 ++++++++++++-------------------------
 1 file changed, 12 insertions(+), 25 deletions(-)

(limited to 'nis/nss_nis/nis-spwd.c')

diff --git a/nis/nss_nis/nis-spwd.c b/nis/nss_nis/nis-spwd.c
index c06e95457e..99a9ed5f48 100644
--- a/nis/nss_nis/nis-spwd.c
+++ b/nis/nss_nis/nis-spwd.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997, 1998, 2001, 2002 Free Software Foundation, Inc.
+/* Copyright (C) 1996-1998, 2001, 2002, 2003 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Thorsten Kukuk <kukuk@vt.uni-paderborn.de>, 1996.
 
@@ -21,7 +21,11 @@
 #include <ctype.h>
 #include <errno.h>
 #include <string.h>
+/* The following is an ugly trick to avoid a prototype declaration for
+   _nss_nis_endspent.  */
+#define _nss_nis_endspent _nss_nis_endspent_XXX
 #include <shadow.h>
+#undef _nss_nis_endspent
 #include <bits/libc-lock.h>
 #include <rpcsvc/yp.h>
 #include <rpcsvc/ypclnt.h>
@@ -47,35 +51,18 @@ _nss_nis_setspent (int stayopen)
   __libc_lock_lock (lock);
 
   new_start = 1;
-  if (oldkey != NULL)
-    {
-      free (oldkey);
-      oldkey = NULL;
-      oldkeylen = 0;
-    }
-
-  __libc_lock_unlock (lock);
-
-  return NSS_STATUS_SUCCESS;
-}
-
-enum nss_status
-_nss_nis_endspent (void)
-{
-  __libc_lock_lock (lock);
-
-  new_start = 1;
-  if (oldkey != NULL)
-    {
-      free (oldkey);
-      oldkey = NULL;
-      oldkeylen = 0;
-    }
+  free (oldkey);
+  oldkey = NULL;
+  oldkeylen = 0;
 
   __libc_lock_unlock (lock);
 
   return NSS_STATUS_SUCCESS;
 }
+/* Make _nss_nis_endspent an alias of _nss_nis_setspent.  We do this
+   even though the prototypes don't match.  The argument of setspent
+   is not used so this makes no difference.  */
+strong_alias (_nss_nis_setspent, _nss_nis_endspent)
 
 static enum nss_status
 internal_nis_getspent_r (struct spwd *sp, char *buffer, size_t buflen,
-- 
cgit v1.2.3