From: Harlan Stenn <stenn@ntp.org>
Date: Sat, 22 Jan 2011 06:16:02 +0000 (-0500)
Subject: Avoid shadowing the "group" global variable
X-Git-Tag: NTP_4_2_7P122~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=15a4261fa03cae463877f7a7847e28319ec2c098;p=thirdparty%2Fntp.git

Avoid shadowing the "group" global variable

bk: 4d3a7622EO-2gAj_6M0qTELIlTcnMQ
---

diff --git a/ChangeLog b/ChangeLog
index 65ecb40cf..25f1a1869 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* Avoid shadowing the "group" global variable.
 (4.2.7p121) 2011/01/21 Released by Harlan Stenn <stenn@ntp.org>
 * [Bug 1786] Remove extra semicolon from ntp_proto.c .
 (4.2.7p120) 2011/01/20 Released by Harlan Stenn <stenn@ntp.org>
diff --git a/ntpd/ntp_proto.c b/ntpd/ntp_proto.c
index d5895b865..d881106a1 100644
--- a/ntpd/ntp_proto.c
+++ b/ntpd/ntp_proto.c
@@ -857,7 +857,7 @@ receive(
 
 #ifdef AUTOKEY
 		/*
-		 * Do not respond if not the same groupl;
+		 * Do not respond if not the same group.
 		 */
 		if (group_test(groupname, NULL)) {
 			sys_declined++;
@@ -918,7 +918,7 @@ receive(
 
 #ifdef AUTOKEY
 		/*
-		 * Do not respond if not the same groupl;
+		 * Do not respond if not the same group.
 		 */
 		if (group_test(groupname, sys_ident)) {
 			sys_declined++;
@@ -1020,7 +1020,7 @@ receive(
 
 #ifdef AUTOKEY
 		/*
-		 * Do not respond if not the same groupl;
+		 * Do not respond if not the same group.
 		 */
 		if (group_test(groupname, sys_ident)) {
 			sys_declined++;
@@ -1085,7 +1085,7 @@ receive(
 
 #ifdef AUTOKEY
 		/*
-		 * Do not respond if not the same groupl;
+		 * Do not respond if not the same group.
 		 */
 		if (group_test(groupname, peer->ident)) {
 			sys_declined++;
@@ -3572,20 +3572,20 @@ pool_xmit(
 	 * * ignore if notrust
 	 */
 int group_test(
-	char	*group,
+	char	*grp,
 	char	*ident
 	)
 {
-	if (group == NULL)
+	if (grp == NULL)
 		return (0);
 
-	if (strcmp(group, sys_groupname) == 0)
+	if (strcmp(grp, sys_groupname) == 0)
 		return (0);
 
 	if (ident == NULL)
 		return (1);
 
-	if (strcmp(group, ident) == 0)
+	if (strcmp(grp, ident) == 0)
 		return (0);
 
 	return (1);