4 files changed, 8 insertions, 8 deletions
diff --git a/nss/nss_dns/dns-host.c b/nss/nss_dns/dns-host.c
index d9bf4d7be5..9a01c9f545 100644
--- a/nss/nss_dns/dns-host.c
+++ b/nss/nss_dns/dns-host.c
@@ -149,7 +149,7 @@ _nss_dns_gethostbyname2_r (const char *name, int af, struct hostent *result,
     break;
   default:
     *h_errnop = NETDB_INTERNAL;
-    errno = EAFNOSUPPORT;
+    __set_errno (EAFNOSUPPORT);
     return NSS_STATUS_UNAVAIL;
   }
 
@@ -310,13 +310,13 @@ _nss_dns_gethostbyaddr_r (const char *addr, int len, int af,
       size = IN6ADDRSZ;
       break;
     default:
-      errno = EAFNOSUPPORT;
+      __set_errno (EAFNOSUPPORT);
       *h_errnop = NETDB_INTERNAL;
       return NSS_STATUS_UNAVAIL;
     }
   if (size != len)
     {
-      errno = EAFNOSUPPORT;
+      __set_errno (EAFNOSUPPORT);
       *h_errnop = NETDB_INTERNAL;
       return NSS_STATUS_UNAVAIL;
     }
diff --git a/nss/nss_files/files-XXX.c b/nss/nss_files/files-XXX.c
index da4ad1f2a5..404a9f9750 100644
--- a/nss/nss_files/files-XXX.c
+++ b/nss/nss_files/files-XXX.c
@@ -146,7 +146,7 @@ internal_getent (struct STRUCTURE *result,
 
   if (buflen < (int) sizeof *data + 1)
     {
-      errno = ERANGE;
+      __set_errno (ERANGE);
       return NSS_STATUS_TRYAGAIN;
     }
 
diff --git a/nss/nss_files/files-parse.c b/nss/nss_files/files-parse.c
index ece253d017..9cfa579ea4 100644
--- a/nss/nss_files/files-parse.c
+++ b/nss/nss_files/files-parse.c
@@ -183,7 +183,7 @@ parse_list (char *line, struct parser_data *data, int datalen)
       if ((char *) &p[1] - (char *) data > datalen)
 	{
 	  /* We cannot fit another pointer in the buffer.  */
-	  errno = ERANGE;
+	  __set_errno (ERANGE);
 	  return NULL;
 	}
       if (*line == '\0')
diff --git a/nss/nsswitch.c b/nss/nsswitch.c
index 79c9d2706d..f49ddb95a6 100644
--- a/nss/nsswitch.c
+++ b/nss/nsswitch.c
@@ -195,14 +195,14 @@ __nss_configure_lookup (const char *dbname, const char *service_line)
 	break;
       if (cmp > 0)
 	{
-	  errno = EINVAL;
+	  __set_errno (EINVAL);
 	  return -1;
 	}
     }
 
   if (cnt == sizeof databases)
     {
-      errno = EINVAL;
+      __set_errno (EINVAL);
       return -1;
     }
 
@@ -216,7 +216,7 @@ __nss_configure_lookup (const char *dbname, const char *service_line)
   if (new_db == NULL)
     {
       /* Illegal service specification.  */
-      errno = EINVAL;
+      __set_errno (EINVAL);
       return -1;
     }