From 4e567b4443d7a1680a7319275e5288eef2c92319 Mon Sep 17 00:00:00 2001 From: Stacey Marshall Date: Thu, 8 Apr 2010 17:04:05 +0100 Subject: 6936684 libresolv2 update breaks users of _res 6908650 ifconfig can't configure static ip address if dns before files in nsswitch.conf --- usr/src/lib/libresolv2/common/resolv/res_data.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'usr/src/lib/libresolv2/common/resolv/res_data.c') 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. */ -- cgit v1.2.3