diff --git a/ChangeLog b/ChangeLog
index 69321712c4..7134da3cdc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1999-05-18  Thorsten Kukuk  <kukuk@suse.de>
+
+	* nis/nis_lookup.c (nis_lookup): If we run out of memory, close
+	RPC connection.
+
 1999-05-18  Jakub Jelinek  <jj@ultra.linux.cz>
 
 	* sysdeps/sparc/sparc64/rawmemchr.S: New file.
diff --git a/linuxthreads/manager.c b/linuxthreads/manager.c
index eee4b5c1e1..f390aa13e8 100644
--- a/linuxthreads/manager.c
+++ b/linuxthreads/manager.c
@@ -193,7 +193,7 @@ static int pthread_start_thread(void *arg)
     __sched_setscheduler(THREAD_GETMEM(self, p_pid),
 			 THREAD_GETMEM(self, p_start_args.schedpolicy),
                          &self->p_start_args.schedparam);
-else if (__pthread_manager_thread.p_priority > 0)
+  else if (__pthread_manager_thread.p_priority > 0)
     /* Default scheduling required, but thread manager runs in realtime
        scheduling: switch new thread to SCHED_OTHER policy */
     {
diff --git a/nis/nis_lookup.c b/nis/nis_lookup.c
index cdc5b3f1f9..646b15df49 100644
--- a/nis/nis_lookup.c
+++ b/nis/nis_lookup.c
@@ -127,7 +127,10 @@ nis_lookup (const_nis_name name, const unsigned int flags)
 			nis_freeresult (res);
 			res = calloc (1, sizeof (nis_result));
 			if (res == NULL)
-			  return NULL;
+			  {
+			    __nisbind_destroy (&bptr);
+			    return NULL;
+			  }
 
 			link_first_try = 1; /* Try at first the old binding */
 			goto again;