From feaf3950fd02c0e76e268252d35dfa61f27751d0 Mon Sep 17 00:00:00 2001
From: Matthijs Mekking <matthijs@isc.org>
Date: Fri, 24 Jun 2022 09:58:40 +0200
Subject: [PATCH] Fix a bug in the duration_fromtext function

The function actually did not enforce that the duration string starts
with a P (or p), just that there is a P (or p) in the string.

(cherry picked from commit 8e18fa5874226600198138c098a437275cd31557)
---
 bin/tests/system/checkconf/bad-duration.conf | 16 ++++++++++++++++
 lib/isccfg/duration.c                        |  4 ++--
 2 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 bin/tests/system/checkconf/bad-duration.conf

diff --git a/bin/tests/system/checkconf/bad-duration.conf b/bin/tests/system/checkconf/bad-duration.conf
new file mode 100644
index 0000000000..1fbecc7229
--- /dev/null
+++ b/bin/tests/system/checkconf/bad-duration.conf
@@ -0,0 +1,16 @@
+/*
+ * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+ *
+ * SPDX-License-Identifier: MPL-2.0
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0.  If a copy of the MPL was not distributed with this
+ * file, you can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * See the COPYRIGHT file distributed with this work for additional
+ * information regarding copyright ownership.
+ */
+
+dnssec-policy "test" {
+	dnskey-ttl xPT1H;
+};
diff --git a/lib/isccfg/duration.c b/lib/isccfg/duration.c
index 30d110ab0a..0a7501b022 100644
--- a/lib/isccfg/duration.c
+++ b/lib/isccfg/duration.c
@@ -61,10 +61,10 @@ isccfg_duration_fromtext(isc_textregion_t *source,
 	duration->unlimited = false;
 
 	/* Every duration starts with 'P' */
-	P = strpbrk(str, "Pp");
-	if (P == NULL) {
+	if (toupper(str[0]) != 'P') {
 		return (ISC_R_BADNUMBER);
 	}
+	P = str;
 
 	/* Record the time indicator. */
 	T = strpbrk(str, "Tt");