import of dnsmasq-2.37.tar.gz

This commit is contained in:
Simon Kelley committed 2012-01-05 17:31:13 +00:00
1 parent 832af0bafb
commit 1b7ecd111d
25 files changed
+2013 -1640

No files matched your search

+7 -1
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)