 + 
 + #ifdef DO_STATIC_NSS
 +       if (!((name_alloc_len == 6 && strncmp(name,"files",5) == 0) ||
-+ 	    (name_alloc_len == 4 && strncmp(name,"dns",3) == 0)))
++       (name_alloc_len == 4 && strncmp(name,"dns",3) == 0)))
 +       {
-+ 	name = (char*) "files";
-+         name_alloc_len=6;
++         name = (char*) "files";
++         name_alloc_len = 6;
 +       }
-+ #endif      
++ #endif
   
         new_service = (service_user *) malloc (sizeof (service_user)
 ! 					     + name_alloc_len);

  
  /* Maximum amount by which a process can descrease its asynchronous I/O
     priority level.  */
diff -r -c --exclude=*.info* glibc-2.2.4/nss/nsswitch.c glibc-2.2.4-new/nss/nsswitch.c
*** glibc-2.2.4/nss/nsswitch.c	Mon Jul 23 20:54:48 2001
--- glibc-2.2.4-new/nss/nsswitch.c	Fri May  3 04:17:44 2002
***************
*** 496,501 ****
--- 496,502 ----
      {
        service_user *new_service;
        const char *name;
+       int name_alloc_len;
  
        while (isspace (line[0]))
  	++line;
***************
522
        if (name == line)
  	return result;
  

  #endif
  
  /* The initial size of the thread stack.  Must be a multiple of PAGE_SIZE.  */
diff -r -c --exclude='*.info*' glibc-2.2.5.org/linuxthreads/sysdeps/unix/sysv/linux/bits/local_lim.h glibc-2.2.5/linuxthreads/sysdeps/unix/sysv/linux/bits/local_lim.h
*** glibc-2.2.5.org/linuxthreads/sysdeps/unix/sysv/linux/bits/local_lim.h	Thu Jun  8 21:49:49 2000
--- glibc-2.2.5/linuxthreads/sysdeps/unix/sysv/linux/bits/local_lim.h	Tue May 21 10:52:58 2002
***************
*** 64,70 ****
  /* The number of threads per process.  */
