Avoid shadowing the "group" global variable

bk: 4d3a7622EO-2gAj_6M0qTELIlTcnMQ

diff --git a/ChangeLog b/ChangeLog
index 65ecb40cf07cc7bfe1325fca78b952b43c905cdc..25f1a18690505968f286b2b69eff2a15627eadba 100644 (file)
--- 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 d5895b865ee24f528c1295dbc063f6d5ac6935ff..d881106a110d525bedba32660025b4419576f5ee 100644 (file)
--- 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);