complete strtok fix

(cherry picked from commit 74c3b9d3b2669740596d5d1e5aae2a32695f3a73)

diff --git a/bin/named/main.c b/bin/named/main.c
index 19ae57e2d7f601a92c7baa9021cfe1c9a3477950..e67c0b818da5189f1c8acf10949a66c08872485b 100644 (file)
--- a/bin/named/main.c
+++ b/bin/named/main.c
@@ -433,7 +433,6 @@ set_flags(const char *arg, struct flag_def *defs, unsigned int *ret) {
 static void
 parse_T_opt(char *option) {
        const char *p;
-       char *last = NULL;
        /*
         * force the server to behave (or misbehave) in
         * specified ways for testing purposes.
@@ -476,7 +475,7 @@ parse_T_opt(char *option) {
        } else if (!strncmp(option, "maxudp=", 7)) {
                maxudp = atoi(option + 7);
        } else if (!strncmp(option, "mkeytimers=", 11)) {
-               p = strtok(option + 11, "/", &last);
+               p = strtok(option + 11, "/");
                if (p == NULL) {
                        ns_main_earlyfatal("bad mkeytimer");
                }
@@ -486,7 +485,7 @@ parse_T_opt(char *option) {
                        ns_main_earlyfatal("bad mkeytimer");
                }
 
-               p = strtok(NULL, "/", &last);
+               p = strtok(NULL, "/");
                if (p == NULL) {
                        dns_zone_mkey_day = (24 * dns_zone_mkey_hour);
                        dns_zone_mkey_month = (30 * dns_zone_mkey_day);
@@ -497,7 +496,7 @@ parse_T_opt(char *option) {
                if (dns_zone_mkey_day < dns_zone_mkey_hour)
                        ns_main_earlyfatal("bad mkeytimer");
 
-               p = strtok(NULL, "/", &last);
+               p = strtok(NULL, "/");
                if (p == NULL) {
                        dns_zone_mkey_month = (30 * dns_zone_mkey_day);
                        return;