import of dnsmasq-2.37.tar.gz

This commit is contained in:
Simon Kelley
2007-02-05 14:57:57 +00:00
parent 832af0bafb
commit 1b7ecd111d
25 changed files with 2013 additions and 1640 deletions

View File

@@ -38,7 +38,11 @@ static char *compile_opts =
#ifdef NO_GETTEXT
"no-"
#endif
"I18N ";
"I18N "
#ifndef HAVE_TFTP
"no-"
#endif
"TFTP";
static pid_t pid;
static int pipewrite;
@@ -368,6 +372,8 @@ int main (int argc, char **argv)
if (daemon->resolv_files && !daemon->resolv_files->is_default)
syslog(LOG_WARNING, _("warning: ignoring resolv-file flag because no-resolv is set"));
daemon->resolv_files = NULL;
if (!daemon->servers)
syslog(LOG_WARNING, _("warning: no upstream servers configured"));
}
if (daemon->dhcp)