diff -rc glibc-2.7-orig/sysdeps/posix/getaddrinfo.c glibc-2.7/sysdeps/posix/getaddrinfo.c
*** glibc-2.7-orig/sysdeps/posix/getaddrinfo.c	2007-10-17 18:05:12.000000000 +0200
--- glibc-2.7/sysdeps/posix/getaddrinfo.c	2008-04-08 12:17:09.000000000 +0200
***************
*** 498,505 ****
  	  int no_data = 0;
  	  int no_inet6_data = 0;
  	  service_user *nip = NULL;
- 	  enum nss_status inet6_status = NSS_STATUS_UNAVAIL;
- 	  enum nss_status status = NSS_STATUS_UNAVAIL;
  	  int no_more;
  	  int old_res_options;
  
--- 498,503 ----
***************
*** 689,694 ****
--- 687,694 ----
  
  	  while (!no_more)
  	    {
+               enum nss_status inet6_status = NSS_STATUS_UNAVAIL;
+               enum nss_status status = NSS_STATUS_UNAVAIL;
  	      nss_gethostbyname3_r fct = NULL;
  	      if (req->ai_flags & AI_CANONNAME)
  		/* No need to use this function if we do not look for
