 + 
 + #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);

  	return result;
  
!       *((char *) __mempcpy (new_service->name, name, name_alloc_len-1)) = '\0';
  
        /* Set default actions.  */
        new_service->actions[2 + NSS_STATUS_TRYAGAIN] = NSS_ACTION_CONTINUE;
diff -r -c --exclude=*.info* glibc-2.2.4/time/Makefile glibc-2.2.4-new/time/Makefile
*** glibc-2.2.4/time/Makefile	Fri Aug 10 22:12:07 2001
--- glibc-2.2.4-new/time/Makefile	Tue Apr 16 15:11:09 2002
***************
*** 37,44 ****
  

diff -r -c --exclude='*.info*' glibc-2.2.5.org/linuxthreads/internals.h glibc-2.2.5/linuxthreads/internals.h
*** glibc-2.2.5.org/linuxthreads/internals.h	Thu Nov 29 08:44:16 2001
--- glibc-2.2.5/linuxthreads/internals.h	Tue May 21 10:51:53 2002
***************
*** 343,349 ****
     THREAD_SELF implementation is used, this must be a power of two and
     a multiple of PAGE_SIZE.  */
  #ifndef STACK_SIZE
