File glibc-fix-nscd.diff of Package glibc

diff -urp nscd.mm/cache.c nscd/cache.c
--- nscd.mm/cache.c	2008-10-13 13:09:35.120009000 +0000
+++ nscd/cache.c	2008-10-13 15:11:17.629844982 +0000
@@ -300,7 +300,7 @@ prune_cache (struct database_dyn *table,
 
   /* now == 0 means just check for changed files */
   if (now == (time_t)0)
-    return;
+    return 0;
 
   /* We run through the table and find values which are not valid anymore.
 
diff -urp nscd.mm/connections.c nscd/connections.c
--- nscd.mm/connections.c	2008-10-13 13:09:35.120009000 +0000
+++ nscd/connections.c	2008-10-13 14:55:22.417018210 +0000
@@ -1816,22 +1816,5 @@ main_loop_poll (void)
 	      /* We have a new incoming connection.  Accept the connection.  */
 	      int fd;
 
-#ifndef __ASSUME_PACCEPT
-	      fd = -1;
-	      if (have_paccept >= 0)
-#endif
-		{
-#if 0
-		  fd = TEMP_FAILURE_RETRY (paccept (sock, NULL, NULL, NULL,
-						    SOCK_NONBLOCK));
-#ifndef __ASSUME_PACCEPT
-		  if (have_paccept == 0)
-		    have_paccept = fd != -1 || errno != ENOSYS ? 1 : -1;
-#endif
-#endif
-		}
-#ifndef __ASSUME_PACCEPT
-	      if (have_paccept < 0)
-		fd = TEMP_FAILURE_RETRY (accept (sock, NULL, NULL));
-#endif
+	      fd = TEMP_FAILURE_RETRY (accept (sock, NULL, NULL));
 
 	      /* Use the descriptor if we have not reached the limit.  */
 	      if (fd >= 0)
--- sysdeps/unix/sysv/linux/kernel-features.h.mm	2008-08-25 13:02:49.000000000 +0000
+++ sysdeps/unix/sysv/linux/kernel-features.h	2008-10-13 14:27:31.357847116 +0000
@@ -509,5 +509,4 @@
 # define __ASSUME_SOCK_CLOEXEC	1
 # define __ASSUME_IN_NONBLOCK	1
 # define __ASSUME_PIPE2		1
-# define __ASSUME_PACCEPT	1
 #endif
openSUSE Build Service is sponsored by