   	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
+diff -r -c --exclude='*.info*' glibc-2.2.5.org/time/Makefile glibc-2.2.5/time/Makefile
+*** glibc-2.2.5.org/time/Makefile	Fri Aug 10 01:59:41 2001
+--- glibc-2.2.5/time/Makefile	Tue May 21 11:01:11 2002
 ***************
 *** 37,44 ****
   

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

  	    -DTZDEFRULES='"$(posixrules-file)"'
  
  CFLAGS-tzfile.c = $(tz-cflags)
diff -r -c --exclude='*.info*' glibc-2.2.5.org/timezone/Makefile glibc-2.2.5/timezone/Makefile
*** glibc-2.2.5.org/timezone/Makefile	Thu Aug 30 00:45:25 2001
--- glibc-2.2.5/timezone/Makefile	Tue May 21 11:01:57 2002
***************
*** 159,166 ****
  
