From: Evan Hunt <each@isc.org>
Date: Sun, 10 Jun 2018 05:29:31 +0000 (-0700)
Subject: use strtok() instead of strtok_r() in command line processing
X-Git-Tag: v9.10.8rc1~4^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=48ff5b29beeece521453290b3d62d5f022ea6d14;p=thirdparty%2Fbind9.git

use strtok() instead of strtok_r() in command line processing

(cherry picked from commit 1734f1b3b9a30418d316dcf7b03328e49862daf3)
---

diff --git a/bin/named/main.c b/bin/named/main.c
index bc2be3b8af5..19ae57e2d7f 100644
--- a/bin/named/main.c
+++ b/bin/named/main.c
@@ -476,7 +476,7 @@ parse_T_opt(char *option) {
 	} else if (!strncmp(option, "maxudp=", 7)) {
 		maxudp = atoi(option + 7);
 	} else if (!strncmp(option, "mkeytimers=", 11)) {
-		p = strtok_r(option + 11, "/", &last);
+		p = strtok(option + 11, "/", &last);
 		if (p == NULL) {
 			ns_main_earlyfatal("bad mkeytimer");
 		}
@@ -486,7 +486,7 @@ parse_T_opt(char *option) {
 			ns_main_earlyfatal("bad mkeytimer");
 		}
 
-		p = strtok_r(NULL, "/", &last);
+		p = strtok(NULL, "/", &last);
 		if (p == NULL) {
 			dns_zone_mkey_day = (24 * dns_zone_mkey_hour);
 			dns_zone_mkey_month = (30 * dns_zone_mkey_day);
@@ -497,7 +497,7 @@ parse_T_opt(char *option) {
 		if (dns_zone_mkey_day < dns_zone_mkey_hour)
 			ns_main_earlyfatal("bad mkeytimer");
 
-		p = strtok_r(NULL, "/", &last);
+		p = strtok(NULL, "/", &last);
 		if (p == NULL) {
 			dns_zone_mkey_month = (30 * dns_zone_mkey_day);
 			return;