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

diff --git a/bin/named/main.c b/bin/named/main.c
index 7c1c13933b99c357245d6acdd5e444b0030d68ee..09842fd472979a760ff6a27d84e266d792e4b724 100644 (file)
--- a/bin/named/main.c
+++ b/bin/named/main.c
@@ -352,7 +352,7 @@ save_command_line(int argc, char *argv[]) {
                *dst++ = ' ';
 
                while (*src != '\0' && dst < eob) {
-                       if (isalnum(*src) ||
+                       if (isalnum(*src) || *src == ',' ||
                            *src == '-' || *src == '_' ||
                            *src == '.' || *src == '/')
                        {

diff --git a/bin/tests/system/resolver/tests.sh b/bin/tests/system/resolver/tests.sh
index 6706e65675c64eafd055fe37b63a9913015ae982..d777ea1ab5d63ab7f95f78aff7fa62478f546440 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