Pi-Hole/dnsmasq
1
0
Fork 0
mirror of https://github.com/pi-hole/dnsmasq.git synced 2025-12-20 02:38:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

import of dnsmasq-2.55.tar.gz

Browse Source
This commit is contained in:
Simon Kelley
2010-06-07 22:01:39 +01:00
parent 8ef5ada238
commit c52e189734
16 changed files with 716 additions and 692 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/option.c
View File

@@ -931,34 +931,43 @@ static char *parse_dhcp_opt(char *arg, int flags)
while (arg && *arg)
{
char *dom;
if (!(dom = arg = canonicalise_opt(arg)))
char *in, *dom = NULL;
size_t domlen = 1;
/* Allow "." as an empty domain */
if (strcmp (arg, ".") != 0)
{
problem = _("bad domain in dhcp-option");
break;
if (!(dom = canonicalise_opt(arg)))
{
problem = _("bad domain in dhcp-option");
break;
}
domlen = strlen(dom) + 2;
}
newp = opt_malloc(len + strlen(arg) + 2 + header_size);
newp = opt_malloc(len + domlen + header_size);
if (m)
memcpy(newp, m, header_size + len);
{
memcpy(newp, m, header_size + len);
free(m);
}
m = newp;
p = m + header_size;
q = p + len;
/* add string on the end in RFC1035 format */
while (*arg)
for (in = dom; in && *in;)
{
unsigned char *cp = q++;
int j;
for (j = 0; *arg && (*arg != '.'); arg++, j++)
*q++ = *arg;
for (j = 0; *in && (*in != '.'); in++, j++)
*q++ = *in;
*cp = j;
if (*arg)
arg++;
if (*in)
in++;
}
*q++ = 0;
free(dom);
/* Now tail-compress using earlier names. */
newlen = q - p;
for (tail = p + len; *tail; tail += (*tail) + 1)