Change macro RESOLVCONF to RESOLV_CONF. This allows Win32 to pick up the real location of resolv.conf through ntpaths.c. Otherwise location defaults to Unix location [RT #1833]

This commit is contained in:
Danny Mayer 2001-10-04 03:20:23 +00:00
parent 9e46f410e7
commit cddaf5def3
2 changed files with 7 additions and 6 deletions

View file

@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: dighost.c,v 1.229 2001/10/01 18:53:53 gson Exp $ */
/* $Id: dighost.c,v 1.230 2001/10/04 03:20:21 mayer Exp $ */
/*
* Notice to programmers: Do not use this code as an example of how to
@ -619,7 +619,7 @@ setup_system(void) {
free_now = ISC_FALSE;
get_servers = ISC_TF(server_list.head == NULL);
fp = fopen(RESOLVCONF, "r");
fp = fopen(RESOLV_CONF, "r");
/* XXX Use lwres resolv.conf reader */
if (fp == NULL)
goto no_file;

View file

@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: dig.h,v 1.73 2001/10/01 18:53:54 gson Exp $ */
/* $Id: dig.h,v 1.74 2001/10/04 03:20:23 mayer Exp $ */
#ifndef DIG_H
#define DIG_H
@ -40,7 +40,9 @@
#define MXRD 32
#define BUFSIZE 512
#define COMMSIZE 0xffff
#define RESOLVCONF "/etc/resolv.conf"
#ifndef RESOLV_CONF
#define RESOLV_CONF "/etc/resolv.conf"
#endif
#define OUTPUTBUF 32767
#define MAXRRLIMIT 0xffffffff
#define MAXTIMEOUT 0xffff
@ -187,8 +189,7 @@ void
get_address(char *host, in_port_t port, isc_sockaddr_t *sockaddr);
isc_result_t
get_reverse(char reverse[MXNAME], char *value, isc_boolean_t nibble,
isc_boolean_t strict);
get_reverse(char reverse[MXNAME], char *value, isc_boolean_t nibble);
void
fatal(const char *format, ...) ISC_FORMAT_PRINTF(1, 2);