From fc5d46dc62285ff16deae26818764eafce17f0a6 Mon Sep 17 00:00:00 2001 From: Kevin Darbyshire-Bryant Date: Sat, 3 Aug 2019 20:55:52 +0100 Subject: Revert "dnsmasq: backport latest patches" This reverts commit e9eec39aacde450ba87598d85987b374ce6aed95. Signed-off-by: Kevin Darbyshire-Bryant --- ...re-then-one-conf-file-on-the-command-line.patch | 45 ---------------------- 1 file changed, 45 deletions(-) delete mode 100644 package/network/services/dnsmasq/patches/0051-Allow-more-then-one-conf-file-on-the-command-line.patch (limited to 'package/network/services/dnsmasq/patches/0051-Allow-more-then-one-conf-file-on-the-command-line.patch') diff --git a/package/network/services/dnsmasq/patches/0051-Allow-more-then-one-conf-file-on-the-command-line.patch b/package/network/services/dnsmasq/patches/0051-Allow-more-then-one-conf-file-on-the-command-line.patch deleted file mode 100644 index 0e611af410..0000000000 --- a/package/network/services/dnsmasq/patches/0051-Allow-more-then-one-conf-file-on-the-command-line.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 5c464ef62e02dea96f830425cf43da7f6a272b4c Mon Sep 17 00:00:00 2001 -From: Simon Kelley -Date: Fri, 29 Mar 2019 23:11:05 +0000 -Subject: [PATCH 51/57] Allow more then one --conf-file on the command line. - -Signed-off-by: Kevin Darbyshire-Bryant ---- - man/dnsmasq.8 | 5 +++-- - src/option.c | 11 ++++++++--- - 2 files changed, 11 insertions(+), 5 deletions(-) - ---- a/man/dnsmasq.8 -+++ b/man/dnsmasq.8 -@@ -1942,8 +1942,9 @@ cannot be lower than 1025 unless dnsmasq - of concurrent TFTP connections is limited by the size of the port range. - .TP - .B \-C, --conf-file= --Specify a different configuration file. The \fB--conf-file\fP option is also allowed in --configuration files, to include multiple configuration files. A -+Specify a configuration file. The presence of this option stops dnsmasq from reading the default configuration -+file (normally /etc/dnsmasq.conf). Multiple files may be specified by repeating the option -+either on the command line or in configuration files. A - filename of "-" causes dnsmasq to read configuration from stdin. - .TP - .B \-7, --conf-dir=[,......], ---- a/src/option.c -+++ b/src/option.c -@@ -5012,9 +5012,14 @@ void read_opts(int argc, char **argv, ch - } - else if (option == 'C') - { -- if (conffile) -- free(conffile); -- conffile = opt_string_alloc(arg); -+ if (!conffile) -+ conffile = opt_string_alloc(arg); -+ else -+ { -+ char *extra = opt_string_alloc(arg); -+ one_file(extra, 0); -+ free(extra); -+ } - } - else - { -- cgit v1.2.3