(*desc)++;
- if (d == 0 && extract_name(header, plen, p, buff, 2, 0))
+ if (d == 0 && extract_name(header, plen, p, buff, 1, 0))
/* domain-name, canonicalise */
return to_wire(buff);
else
GETLONG(sig_inception, p);
GETSHORT(key_tag, p);
- if (!extract_name(header, plen, &p, keyname, 2, 0))
+ if (!extract_name(header, plen, &p, keyname, 1, 0))
return STAT_BOGUS;
/* RFC 4035 5.3.1 says that the Signer's Name field MUST equal
u16 len, *dp;
p = rrset[i];
- if (!extract_name(header, plen, &p, name, 2, 10))
+ if (!extract_name(header, plen, &p, name, 1, 10))
return STAT_BOGUS;
name_start = name;
/* namebuff used for workspace above, restore to leave unchanged on exit */
p = (unsigned char*)(rrset[0]);
- extract_name(header, plen, &p, name, 2, 0);
+ extract_name(header, plen, &p, name, 1, 0);
if (key)
{
struct all_addr a;
if (ntohs(header->qdcount) != 1 ||
- !extract_name(header, plen, &p, name, 2, 4))
+ !extract_name(header, plen, &p, name, 1, 4))
return STAT_BOGUS;
GETSHORT(qtype, p);
val = STAT_BOGUS;
p = (unsigned char *)(header+1);
- extract_name(header, plen, &p, name, 2, 4);
+ extract_name(header, plen, &p, name, 1, 4);
p += 4; /* qtype, qclass */
if (!(p = skip_section(p, ntohs(header->ancount), header, plen)))
for (i = 0; i < nsec_count; i++)
{
p = nsecs[i];
- if (!extract_name(header, plen, &p, workspace1, 2, 10))
+ if (!extract_name(header, plen, &p, workspace1, 1, 10))
return STAT_BOGUS;
p += 8; /* class, type, TTL */
GETSHORT(rdlen, p);
psave = p;
- if (!extract_name(header, plen, &p, workspace2, 2, 10))
+ if (!extract_name(header, plen, &p, workspace2, 1, 10))
return STAT_BOGUS;
rc = hostname_cmp(workspace1, name);
for (i = 0; i < nsec_count; i++)
if ((p = nsecs[i]))
{
- if (!extract_name(header, plen, &p, workspace1, 2, 0) ||
+ if (!extract_name(header, plen, &p, workspace1, 1, 0) ||
!(base32_len = base32_decode(workspace1, (unsigned char *)workspace2)))
return 0;
for (i = 0; i < nsec_count; i++)
if ((p = nsecs[i]))
{
- if (!extract_name(header, plen, &p, workspace1, 2, 0) ||
+ if (!extract_name(header, plen, &p, workspace1, 1, 0) ||
!(base32_len = base32_decode(workspace1, (unsigned char *)workspace2)))
return STAT_BOGUS;
qname = p1 = (unsigned char *)(header+1);
- if (!extract_name(header, plen, &p1, name, 2, 4))
+ if (!extract_name(header, plen, &p1, name, 1, 4))
return STAT_BOGUS;
GETSHORT(qtype, p1);
qname = p1;
/* looped CNAMES */
- if (!cname_count-- || !extract_name(header, plen, &p1, name, 2, 0))
+ if (!cname_count-- || !extract_name(header, plen, &p1, name, 1, 0))
return STAT_BOGUS;
p1 = ans_start;
for (p1 = ans_start, i = 0; i < ntohs(header->ancount) + ntohs(header->nscount); i++)
{
- if (!extract_name(header, plen, &p1, name, 2, 10))
+ if (!extract_name(header, plen, &p1, name, 1, 10))
return STAT_BOGUS; /* bad packet */
GETSHORT(type1, p1);
an unsigned zone. Return STAT_NO_SIG to cause this to be proved. */
/* Get name of missing answer */
- if (!extract_name(header, plen, &qname, name, 2, 0))
+ if (!extract_name(header, plen, &qname, name, 1, 0))
return STAT_BOGUS;
if (nsec_type == T_NSEC)
int cname_count = CNAME_CHAIN;
/* Get question */
- if (!extract_name(header, plen, &p, name, 2, 4))
+ if (!extract_name(header, plen, &p, name, 1, 4))
return STAT_BOGUS;
p +=2; /* type */
/* Loop down CNAME chain/ */
if (!cname_count-- ||
- !extract_name(header, plen, &p, name, 2, 0) ||
+ !extract_name(header, plen, &p, name, 1, 0) ||
!(p = skip_questions(header, plen)))
return STAT_BOGUS;
for (q = ntohs(header->qdcount); q != 0; q--)
{
- if (!extract_name(header, plen, &p, name, 2, 4))
+ if (!extract_name(header, plen, &p, name, 1, 4))
break; /* bad packet */
len = to_wire(name);