merge

7 files changed, 14 insertions, 14 deletions

diff --git a/sys/src/cmd/ndb/dnnotify.c b/sys/src/cmd/ndb/dnnotify.c
index 5a85269d8..c52ea469f 100644
--- a/sys/src/cmd/ndb/dnnotify.c
+++ b/sys/src/cmd/ndb/dnnotify.c
@@ -58,8 +58,8 @@ getips(char *name, uchar *ips, int maxips, Request *req)
 			nips++;
 		return nips;
 	}
-	list = dnresolve(name, Cin, Ta, req, nil, 0, 1, 1, nil);
-	rrcat(&list, dnresolve(name, Cin, Taaaa, req, nil, 0, 1, 1, nil));
+	list = dnresolve(name, Cin, Ta, req, nil, 0, Recurse, 0, nil);
+	rrcat(&list, dnresolve(name, Cin, Taaaa, req, nil, 0, Recurse, 0, nil));
 	rp = list = randomize(list);
 	while(rp != nil && nips < maxips){
 		uchar *ip = ips + nips*IPaddrlen;
diff --git a/sys/src/cmd/ndb/dnresolve.c b/sys/src/cmd/ndb/dnresolve.c
index bc2614c69..f595ce39d 100644
--- a/sys/src/cmd/ndb/dnresolve.c
+++ b/sys/src/cmd/ndb/dnresolve.c
@@ -145,7 +145,7 @@ dnresolve(char *name, int class, int type, Request *req, RR **cn, int depth,
 		}
 		if(drp != nil)
 			rrfreelist(drp);
-		procsetname(procname);
+		procsetname("%s", procname);
 		free(procname);
 		return rp;
 	}
@@ -188,7 +188,7 @@ dnresolve(char *name, int class, int type, Request *req, RR **cn, int depth,
 		if(rp == nil && status != nil && dp->respcode != Rok)
 			*status = dp->respcode;
 	}
-	procsetname(procname);
+	procsetname("%s", procname);
 	free(procname);
 	return randomize(rp);
 }
diff --git a/sys/src/cmd/ndb/dns.c b/sys/src/cmd/ndb/dns.c
index 83fe86b71..3a88facec 100644
--- a/sys/src/cmd/ndb/dns.c
+++ b/sys/src/cmd/ndb/dns.c
@@ -771,11 +771,11 @@ send:
 
 /*
  * dnsdebug calls
- *	rr = dnresolve(buf, Cin, type, &req, 0, 0, Recurse, rooted, 0);
+ *	rr = dnresolve(buf, Cin, type, &req, nil, 0, Recurse, rooted, nil);
  * which generates a UDP query, which eventually calls
  *	dnserver(&reqmsg, &repmsg, &req, buf, rcode);
  * which calls
- *	rp = dnresolve(name, Cin, type, req, &mp->an, 0, recurse, 1, 0);
+ *	rp = dnresolve(name, Cin, type, req, &mp->an, 0, recurse, 1, nil);
  *
  * but here we just call dnresolve directly.
  */
@@ -787,7 +787,7 @@ lookupquery(Job *job, Mfile *mf, Request *req, char *errbuf, char *p,
 	RR *rp, *neg;
 
 	status = Rok;
-	rp = dnresolve(p, Cin, mf->type, req, 0, 0, Recurse, rooted, &status);
+	rp = dnresolve(p, Cin, mf->type, req, nil, 0, Recurse, rooted, &status);
 
 	neg = rrremneg(&rp);
 	if(neg){
diff --git a/sys/src/cmd/ndb/dnsdebug.c b/sys/src/cmd/ndb/dnsdebug.c
index dbeef7088..092e0c7b3 100644
--- a/sys/src/cmd/ndb/dnsdebug.c
+++ b/sys/src/cmd/ndb/dnsdebug.c
@@ -349,10 +349,10 @@ squirrelserveraddrs(void)
 		memset(&req, 0, sizeof req);
 		req.isslave = 1;
 		req.aborttime = NS2MS(nowns) + Maxreqtm;
-		*l = dnresolve(rp->host->name, Cin, Ta, &req, 0, 0, Recurse, 0, 0);
+		*l = dnresolve(rp->host->name, Cin, Ta, &req, nil, 0, Recurse, 0, nil);
 		if(*l == nil)
 			*l = dnresolve(rp->host->name, Cin, Taaaa, &req,
-				0, 0, Recurse, 0, 0);
+				nil, 0, Recurse, 0, nil);
 		while(*l != nil)
 			l = &(*l)->next;
 	}
@@ -436,7 +436,7 @@ doquery(char *name, char *tstr)
 	getactivity(&req, 0);
 	req.isslave = 1;
 	req.aborttime = NS2MS(nowns) + Maxreqtm;
-	rr = dnresolve(buf, Cin, type, &req, 0, 0, Recurse, rooted, 0);
+	rr = dnresolve(buf, Cin, type, &req, nil, 0, Recurse, rooted, nil);
 	if(rr){
 		print("----------------------------\n");
 		for(rp = rr; rp; rp = rp->next)
diff --git a/sys/src/cmd/ndb/dnserver.c b/sys/src/cmd/ndb/dnserver.c
index f3f7cfab4..bf0d6ba89 100644
--- a/sys/src/cmd/ndb/dnserver.c
+++ b/sys/src/cmd/ndb/dnserver.c
@@ -171,7 +171,7 @@ doextquery(DNSmsg *mp, Request *req, int recurse)
 
 	name = mp->qd->owner->name;
 	type = mp->qd->type;
-	rp = dnresolve(name, Cin, type, req, &mp->an, 0, recurse, 1, 0);
+	rp = dnresolve(name, Cin, type, req, &mp->an, 0, recurse, 1, nil);
 
 	/* don't return soa hints as answers, it's wrong */
 	if(rp && rp->db && !rp->auth && rp->type == Tsoa) {
diff --git a/sys/src/cmd/ndb/dnsgetip.c b/sys/src/cmd/ndb/dnsgetip.c
index 8c7712c65..e53fccbb6 100644
--- a/sys/src/cmd/ndb/dnsgetip.c
+++ b/sys/src/cmd/ndb/dnsgetip.c
@@ -38,7 +38,7 @@ resolve(char *name, int type)
 	req.isslave = 1;
 	req.aborttime = NS2MS(nowns) + Maxreqtm;
 
-	rr = dnresolve(name, Cin, type, &req, 0, 0, Recurse, 0, &status);
+	rr = dnresolve(name, Cin, type, &req, nil, 0, Recurse, 0, &status);
 	neg = rrremneg(&rr);
 	if(rr == nil || neg != nil){
 		if(neg != nil)
diff --git a/sys/src/cmd/ndb/dnstcp.c b/sys/src/cmd/ndb/dnstcp.c
index 261852655..765700720 100644
--- a/sys/src/cmd/ndb/dnstcp.c
+++ b/sys/src/cmd/ndb/dnstcp.c
@@ -265,8 +265,8 @@ findserver(uchar *srcip, Server *servers, Request *req)
 				return servers;
 			continue;
 		}
-		list = dnresolve(servers->name, Cin, Ta, req, nil, 0, 1, 1, nil);
-		rrcat(&list, dnresolve(servers->name, Cin, Taaaa, req, nil, 0, 1, 1, nil));
+		list = dnresolve(servers->name, Cin, Ta, req, nil, 0, Recurse, 0, nil);
+		rrcat(&list, dnresolve(servers->name, Cin, Taaaa, req, nil, 0, Recurse, 0, nil));
 		for(rp = list; rp != nil; rp = rp->next){
 			if(parseip(ip, rp->ip->name) == -1)
 				continue;