don't escape commas when saving named's command line

(cherry picked from commit 70dd93bf8a3512b7ae98f7990e9e8b35fe0adb14)

diff --git a/bin/named/main.c b/bin/named/main.c
index 62d9ce3db3a5f40cd7e63b7aafdef64546aa026d..6371d15090c7ea7dddf0d90a87fa80cb9bdeae8b 100644 (file)
--- a/bin/named/main.c
+++ b/bin/named/main.c
@@ -358,7 +358,7 @@ save_command_line(int argc, char *argv[]) {
                         * nearly always be fine.
                         */
                        if (quoted || isalnum(*src & 0xff) ||
-                           *src == '-' || *src == '_' ||
+                           *src == ',' || *src == '-' || *src == '_' ||
                            *src == '.' || *src == '/') {
                                *dst++ = *src++;
                                quoted = false;

diff --git a/bin/tests/system/resolver/tests.sh b/bin/tests/system/resolver/tests.sh
index 3d32e31ad6fd55ffb9d97c08fda3d81203cf65a7..7fce73d21fbd57aef64bab7ff003f8da32613ef8 100755 (executable)
--- a/bin/tests/system/resolver/tests.sh
+++ b/bin/tests/system/resolver/tests.sh
@@ -795,5 +795,12 @@ grep "status: SERVFAIL" dig.ns5.out.${n} > /dev/null || ret=1
 if [ $ret != 0 ]; then echo_i "failed"; fi
 status=`expr $status + $ret`
 
+n=`expr $n + 1`
+echo_i "check logged command line ($n)"
+ret=0
+grep "running as: .* -m record,size,mctx " ns1/named.run > /dev/null || ret=1
+if [ $ret != 0 ]; then echo_i "failed"; fi
+status=`expr $status + $ret`
+
 echo_i "exit status: $status"
 [ $status -eq 0 ] || exit 1