Version 1.0.

[adns] / src / setup.c

diff --git a/src/setup.c b/src/setup.c
index e19a70536b2753a62debb6268492010e8c9b0551..f4be5dd993d79ce366aa15b5decaac2f2b47fd39 100644 (file)
--- a/src/setup.c
+++ b/src/setup.c
@@ -8,8 +8,8 @@
  *    Copyright (C) 1997-1999 Ian Jackson <ian@davenant.greenend.org.uk>
  *
  *  It is part of adns, which is
  *    Copyright (C) 1997-1999 Ian Jackson <ian@davenant.greenend.org.uk>
  *
  *  It is part of adns, which is

- *    Copyright (C) 1997-1999 Ian Jackson <ian@davenant.greenend.org.uk>
- *    Copyright (C) 1999 Tony Finch <dot@dotat.at>
+ *    Copyright (C) 1997-2000 Ian Jackson <ian@davenant.greenend.org.uk>
+ *    Copyright (C) 1999-2000 Tony Finch <dot@dotat.at>

  *  
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by


@@ -39,7 +39,7 @@
 
 #include "internal.h"
 
 
 #include "internal.h"
 

-static void readconfig(adns_state ads, const char *filename);
+static void readconfig(adns_state ads, const char *filename, int warnmissing);

 
 static void addserver(adns_state ads, struct in_addr addr) {
   int i;
 
 static void addserver(adns_state ads, struct in_addr addr) {
   int i;


@@ -264,7 +264,7 @@ static void ccf_include(adns_state ads, const char *fn, int lno, const char *buf
     configparseerr(ads,fn,lno,"`include' directive with no filename");
     return;
   }
     configparseerr(ads,fn,lno,"`include' directive with no filename");
     return;
   }

-  readconfig(ads,buf);
+  readconfig(ads,buf,1);

 }
 
 static const struct configcommandinfo {
 }
 
 static const struct configcommandinfo {


@@ -399,13 +399,14 @@ static const char *instrum_getenv(adns_state ads, const char *envvar) {
   return value;
 }
 
   return value;
 }
 

-static void readconfig(adns_state ads, const char *filename) {
+static void readconfig(adns_state ads, const char *filename, int warnmissing) {

   getline_ctx gl_ctx;
   
   gl_ctx.file= fopen(filename,"r");
   if (!gl_ctx.file) {
     if (errno == ENOENT) {
   getline_ctx gl_ctx;
   
   gl_ctx.file= fopen(filename,"r");
   if (!gl_ctx.file) {
     if (errno == ENOENT) {

-      adns__debug(ads,-1,0,"configuration file `%s' does not exist",filename);
+      if (warnmissing)
+       adns__debug(ads,-1,0,"configuration file `%s' does not exist",filename);

       return;
     }
     saveerr(ads,errno);
       return;
     }
     saveerr(ads,errno);


@@ -434,7 +435,7 @@ static void readconfigenv(adns_state ads, const char *envvar) {
     return;
   }
   filename= instrum_getenv(ads,envvar);
     return;
   }
   filename= instrum_getenv(ads,envvar);

-  if (filename) readconfig(ads,filename);
+  if (filename) readconfig(ads,filename,1);

 }
 
 static void readconfigenvtext(adns_state ads, const char *envvar) {
 }
 
 static void readconfigenvtext(adns_state ads, const char *envvar) {


@@ -535,7 +536,8 @@ int adns_init(adns_state *ads_r, adns_initflags flags, FILE *diagfile) {
   ccf_options(ads,"RES_OPTIONS",-1,res_options);
   ccf_options(ads,"ADNS_RES_OPTIONS",-1,adns_res_options);
 
   ccf_options(ads,"RES_OPTIONS",-1,res_options);
   ccf_options(ads,"ADNS_RES_OPTIONS",-1,adns_res_options);
 

-  readconfig(ads,"/etc/resolv.conf");
+  readconfig(ads,"/etc/resolv.conf",1);
+  readconfig(ads,"/etc/resolv-adns.conf",0);

   readconfigenv(ads,"RES_CONF");
   readconfigenv(ads,"ADNS_RES_CONF");
 
   readconfigenv(ads,"RES_CONF");
   readconfigenv(ads,"ADNS_RES_CONF");