From 3842a051baf34ffc4e428cd6f2d4a641e548e6f6 Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Wed, 7 Nov 2001 04:44:09 +0000
Subject: [PATCH] 1109.   [bug]           nsupdate accepted illegal ttl values.
 	e.g. "update add foo -0 IN A 1.2.3.4" simlified ttl range processing
 by using unsigned long.

---
 CHANGES                 |  2 ++
 bin/nsupdate/nsupdate.c | 21 ++++++---------------
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/CHANGES b/CHANGES
index 7473385d92..5b19318504 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+1109.	[bug]		nsupdate accepted illegal ttl values.
+
 1108.	[bug]		On Win32 rndc was hanging when named was not running.
 			Fix to look for exceptions in the socket.c select
 			code to catch and report the errors. Miscellaneous
diff --git a/bin/nsupdate/nsupdate.c b/bin/nsupdate/nsupdate.c
index b260589fea..faca071429 100644
--- a/bin/nsupdate/nsupdate.c
+++ b/bin/nsupdate/nsupdate.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: nsupdate.c,v 1.111 2001/11/06 20:21:42 gson Exp $ */
+/* $Id: nsupdate.c,v 1.112 2001/11/07 04:44:09 marka Exp $ */
 
 #include <config.h>
 
@@ -1101,7 +1101,7 @@ static isc_uint16_t
 update_addordelete(char *cmdline, isc_boolean_t isdelete) {
 	isc_result_t result;
 	dns_name_t *name = NULL;
-	long ttl;
+	unsigned long ttl;
 	char *word;
 	dns_rdataclass_t rdataclass;
 	dns_rdatatype_t rdatatype;
@@ -1147,29 +1147,20 @@ update_addordelete(char *cmdline, isc_boolean_t isdelete) {
 			goto doneparsing;
 		}
 	}
-	errno = 0;
-	ttl = strtol(word, &endp, 0);
-	if (*endp != '\0') {
+	ttl = strtoul(word, &endp, 0);
+	if (!isdigit((unsigned char)*word) || *endp != '\0') {
 		if (isdelete) {
 			ttl = 0;
 			goto parseclass;
 		} else {
-			fprintf(stderr, "ttl '%s' is not numeric\n", word);
+			fprintf(stderr, "ttl '%s' is not legal\n", word);
 			goto failure;
 		}
 	}
 
 	if (isdelete)
 		ttl = 0;
-	else if (ttl < 0 || ttl > TTL_MAX ||
-		 (ttl == LONG_MAX && errno == ERANGE))
-	{
-		/*
-		 * The errno test is needed to catch when strtol()
-		 * overflows on a platform where sizeof(int) ==
-		 * sizeof(long), because ttl will be set to LONG_MAX,
-		 * which will be equal to TTL_MAX.
-		 */
+	else if (ttl > TTL_MAX) {
 		fprintf(stderr, "ttl '%s' is out of range (0 to %d)\n",
 			word, TTL_MAX);
 		goto failure;