From 50e481ceebce7936e773ced188d830659bdf9e40 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Mon, 29 Dec 2008 20:56:13 +0000 Subject: * nscd/nscd_gethst_r.c (nscd_gethst_r): Don't use nscd if LOCALDOMAIN is defined. * nscd/nscd_getai.c (__nscd_getai): Likewise. --- nscd/nscd_gethst_r.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) (limited to 'nscd/nscd_gethst_r.c') diff --git a/nscd/nscd_gethst_r.c b/nscd/nscd_gethst_r.c index a211404756..aea8288594 100644 --- a/nscd/nscd_gethst_r.c +++ b/nscd/nscd_gethst_r.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1998-2005, 2006, 2007 Free Software Foundation, Inc. +/* Copyright (C) 1998-2005, 2006, 2007, 2008 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 1998. @@ -97,12 +97,25 @@ libc_freeres_fn (hst_map_free) } +int __nss_have_localdomain attribute_hidden; + static int internal_function nscd_gethst_r (const char *key, size_t keylen, request_type type, struct hostent *resultbuf, char *buffer, size_t buflen, struct hostent **result, int *h_errnop) { + if (__builtin_expect (__nss_have_localdomain >= 0, 0)) + { + if (__nss_have_localdomain == 0) + __nss_have_localdomain = getenv ("LOCALDOMAIN") != NULL ? 1 : -1; + if (__nss_have_localdomain > 0) + { + __nss_not_use_nscd_hosts = 1; + return -1; + } + } + int gc_cycle; int nretries = 0; -- cgit 1.4.1