diff options
| author | Eric Faurot <eric@cvs.openbsd.org> | 2012-09-09 16:45:15 +0000 |
|---|---|---|
| committer | Eric Faurot <eric@cvs.openbsd.org> | 2012-09-09 16:45:15 +0000 |
| commit | f536414389c36f1117e0dc47665c1117e1f5fa92 (patch) | |
| tree | e4541f4509a0b9ab0bd7073377f3b70cadf6f14c | |
| parent | 2064e815af6e9afe612aa70659556862210d7ea1 (diff) | |
tweak options
| -rw-r--r-- | lib/libc/asr/asr.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/lib/libc/asr/asr.c b/lib/libc/asr/asr.c index 6c4b2e48319..24ea6270439 100644 --- a/lib/libc/asr/asr.c +++ b/lib/libc/asr/asr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: asr.c,v 1.12 2012/09/09 12:46:36 eric Exp $ */ +/* $OpenBSD: asr.c,v 1.13 2012/09/09 16:45:14 eric Exp $ */ /* * Copyright (c) 2010-2012 Eric Faurot <eric@openbsd.org> * @@ -36,16 +36,19 @@ #include "asr_private.h" #ifndef ASR_OPT_THREADSAFE -# define ASR_OPT_THREADSAFE 1 +#define ASR_OPT_THREADSAFE 1 #endif #ifndef ASR_OPT_HOSTALIASES -# define ASR_OPT_HOSTALIASES 1 +#define ASR_OPT_HOSTALIASES 1 #endif #ifndef ASR_OPT_ENVOPTS -# define ASR_OPT_ENVOPTS 1 +#define ASR_OPT_ENVOPTS 1 #endif #ifndef ASR_OPT_RELOADCONF -# define ASR_OPT_RELOADCONF 1 +#define ASR_OPT_RELOADCONF 1 +#endif +#ifndef ASR_OPT_ALTCONF +#define ASR_OPT_ALTCONF 1 #endif #if ASR_OPT_THREADSAFE @@ -103,9 +106,11 @@ async_resolver(const char *conf) if ((asr = calloc(1, sizeof(*asr))) == NULL) goto fail; +#if ASR_OPT_ALTCONF /* If not setuid/setgid, allow to use an alternate config. */ if (conf == NULL && !issetugid()) conf = getenv("ASR_CONFIG"); +#endif if (conf == NULL) conf = DEFAULT_CONFFILE; |