summaryrefslogtreecommitdiff
path: root/usr/src/lib/libresolv2/common/resolv
diff options
context:
space:
mode:
Diffstat (limited to 'usr/src/lib/libresolv2/common/resolv')
-rw-r--r--usr/src/lib/libresolv2/common/resolv/res_data.c5
-rw-r--r--usr/src/lib/libresolv2/common/resolv/res_init.c4
2 files changed, 5 insertions, 4 deletions
diff --git a/usr/src/lib/libresolv2/common/resolv/res_data.c b/usr/src/lib/libresolv2/common/resolv/res_data.c
index 9297fe311f..be2420da60 100644
--- a/usr/src/lib/libresolv2/common/resolv/res_data.c
+++ b/usr/src/lib/libresolv2/common/resolv/res_data.c
@@ -1,6 +1,5 @@
/*
- * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights reserved.
*/
@@ -91,9 +90,11 @@ struct __res_state _res
# endif
;
+#ifdef ORIGINAL_ISC_CODE
#if defined(DO_PTHREADS) || defined(__linux)
#define _res (*__res_state())
#endif
+#endif
/* Proto. */
diff --git a/usr/src/lib/libresolv2/common/resolv/res_init.c b/usr/src/lib/libresolv2/common/resolv/res_init.c
index e839323a79..477f4f5f73 100644
--- a/usr/src/lib/libresolv2/common/resolv/res_init.c
+++ b/usr/src/lib/libresolv2/common/resolv/res_init.c
@@ -1,6 +1,5 @@
/*
- * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights reserved.
*/
@@ -615,6 +614,7 @@ __res_vinit(res_state statp, int preinit) {
return (statp->res_h_errno);
#ifdef SUNW_INITCHKIF
freedata:
+ RES_SET_H_ERRNO(statp, NETDB_INTERNAL);
if (statp->_u._ext.ext != NULL) {
free(statp->_u._ext.ext);
statp->_u._ext.ext = NULL;