From: Harlan Stenn <stenn@ntp.org>
Date: Mon, 9 Nov 2009 09:08:41 +0000 (-0500)
Subject: authkeys.c cleanup from Dave Mills
X-Git-Tag: NTP_4_2_5P242_RC~1^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ae67d7fbe0818ad8485fc3d3407912d0b7b5041c;p=thirdparty%2Fntp.git

authkeys.c cleanup from Dave Mills

bk: 4af7dc19ONPl5tsOuXm11fEnp6Q_EA
---

diff --git a/ChangeLog b/ChangeLog
index 1d70f1fe7..a4b2ecb0b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* authkeys.c cleanup from Dave Mills.
 (4.2.5p241-RC) 2009/11/07 Released by Harlan Stenn <stenn@ntp.org>
 * html/authopt.html update from Dave Mills.
 * Remove unused file from sntp/Makefile.am's distribution list.
diff --git a/libntp/authkeys.c b/libntp/authkeys.c
index 043e42839..9c32e09f3 100644
--- a/libntp/authkeys.c
+++ b/libntp/authkeys.c
@@ -149,15 +149,14 @@ authhavekey(
 	 */
 	authkeyuncached++;
 	sk = key_hash[KEYHASH(keyno)];
-	while (sk != 0) {
+	while (sk != NULL) {
 		if (keyno == sk->keyid) {
 			if (sk->type == 0) {
 				authkeynotfound++;
 				return (0);
 			}
+			break;
 		}
-		break;
-
 		sk = sk->next;
 	}
 
@@ -165,7 +164,7 @@ authhavekey(
 	 * If the key is not found, or if it is found but not trusted,
 	 * the key is not considered found.
 	 */
-	if (sk == 0) {
+	if (sk == NULL) {
 		authkeynotfound++;
 		return (0);