Get rid of the remains of -Tdelay option

diff --git a/bin/named/main.c b/bin/named/main.c
index 1e00f016a4f4fa12aa971ca422f38e8d1922b193..aeae3c688ba922831037fde2286d725d420661f1 100644 (file)
--- a/bin/named/main.c
+++ b/bin/named/main.c
@@ -141,7 +141,6 @@ static bool nonearest = false;
 static bool nosoa = false;
 static bool notcp = false;
 static bool sigvalinsecs = false;
-static unsigned int delay = 0;
 
 /*
  * -4 and -6
@@ -638,14 +637,10 @@ parse_T_opt(char *option) {
        /*
         * force the server to behave (or misbehave) in
         * specified ways for testing purposes.
-        * delay=xxxx: delay client responses by xxxx ms to
-        *             simulate remote servers.
         * dscp=x:     check that dscp values are as
         *             expected and assert otherwise.
         */
-       if (!strncmp(option, "delay=", 6)) {
-               delay = atoi(option + 6);
-       } else if (!strcmp(option, "dropedns")) {
+       if (!strcmp(option, "dropedns")) {
                dropedns = true;
        } else if (!strncmp(option, "dscp=", 5)) {
                isc_dscp_check_value = atoi(option + 5);
@@ -1318,8 +1313,6 @@ setup(void) {
                ns_server_setoption(sctx, NS_SERVER_NOTCP, true);
        if (sigvalinsecs)
                ns_server_setoption(sctx, NS_SERVER_SIGVALINSECS, true);
-
-       named_g_server->sctx->delay = delay;
 }
 
 static void

diff --git a/lib/ns/include/ns/server.h b/lib/ns/include/ns/server.h
index a8b232340eb6405440397d3acca39443d8470d43..6b45225d5f757392e6e48f9cac0d14656ed03bac 100644 (file)
--- a/lib/ns/include/ns/server.h
+++ b/lib/ns/include/ns/server.h
@@ -90,7 +90,6 @@ struct ns_server {
 
        /*% Test options and other configurables */
        uint32_t                options;
-       unsigned int            delay;
 
        dns_acl_t               *blackholeacl;
        dns_acl_t               *keepresporder;