fix up adnstest for r_unknown; tests for r_unknown

[adns] / src / setup.c

diff --git a/src/setup.c b/src/setup.c
index 21aded08a4790f501716d90519790f159f6f4bff..64949e1fe92ebc412fab0013fba00df75fea0520 100644 (file)
--- a/src/setup.c
+++ b/src/setup.c
@@ -426,7 +426,7 @@ static void readconfiggeneric(adns_state ads, const char *filename,
         ccip++);
     if (!ccip->name) {
       adns__diag(ads,-1,0,"%s:%d: unknown configuration directive `%.*s'",
         ccip++);
     if (!ccip->name) {
       adns__diag(ads,-1,0,"%s:%d: unknown configuration directive `%.*s'",

-                filename,lno,q-p,p);
+                filename,lno,(int)(q-p),p);

       continue;
     }
     while (ctype_whitespace(*q)) q++;
       continue;
     }
     while (ctype_whitespace(*q)) q++;


@@ -509,6 +509,7 @@ int adns__setnonblock(adns_state ads, int fd) {
 static int init_begin(adns_state *ads_r, adns_initflags flags,
                      adns_logcallbackfn *logfn, void *logfndata) {
   adns_state ads;
 static int init_begin(adns_state *ads_r, adns_initflags flags,
                      adns_logcallbackfn *logfn, void *logfndata) {
   adns_state ads;

+  pid_t pid;

   
   ads= malloc(sizeof(*ads)); if (!ads) return errno;
 
   
   ads= malloc(sizeof(*ads)); if (!ads) return errno;
 


@@ -532,6 +533,11 @@ static int init_begin(adns_state *ads_r, adns_initflags flags,
   timerclear(&ads->tcptimeout);
   ads->searchlist= 0;
 
   timerclear(&ads->tcptimeout);
   ads->searchlist= 0;
 

+  pid= getpid();
+  ads->rand48xsubi[0]= pid;
+  ads->rand48xsubi[1]= (unsigned long)pid >> 16;
+  ads->rand48xsubi[2]= pid ^ ((unsigned long)pid >> 16);
+

   *ads_r= ads;
   return 0;
 }
   *ads_r= ads;
   return 0;
 }