ndb/dns: use nil for pointers in dnresolve() args

This commit is contained in:
cinap_lenrek 2018-10-11 18:32:31 +02:00
parent 784a959888
commit ed888f3ee9
4 changed files with 8 additions and 8 deletions

View file

@ -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){

View file

@ -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)

View file

@ -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) {

View file

@ -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)