fix merge typo

bk: 4cdc5403t1khD9FpIbph7do6-CKLGw

diff --git a/ntpd/ntp_config.c b/ntpd/ntp_config.c
index 6f7b831d604ed0d3d179b27da05cb7decf84d79c..1551fe876988e48d2d238028f2b4a9df58784ce6 100644 (file)
--- a/ntpd/ntp_config.c
+++ b/ntpd/ntp_config.c
@@ -3553,7 +3553,6 @@ config_peers(
        )
 {
        sockaddr_u              peeraddr;
-       isc_netaddr_t           i_netaddr;
        struct addrinfo         hints;
        peer_node *             curr_peer;
        peer_resolved_ctx *     ctx;
@@ -3571,17 +3570,9 @@ config_peers(
                 * the hostname off to the blocking child.
                 */
                if (is_ip_address(*cmdline_servers, AF_UNSPEC,
-                                 &i_netaddr)) {
+                                 &peeraddr)) {
 
-                       AF(&peeraddr) = (u_short)i_netaddr.family;
                        SET_PORT(&peeraddr, NTP_PORT);
-                       if (AF_INET6 == i_netaddr.family)
-                               SET_ADDR6N(&peeraddr,
-                                          i_netaddr.type.in6);
-                       else
-                               SET_ADDR4N(&peeraddr,
-                                          i_netaddr.type.in.s_addr);
-
                        if (is_sane_resolved_address(&peeraddr,
                                                     T_Server))
                                peer_config(
@@ -3656,17 +3647,9 @@ config_peers(
                 * the hostname off to the blocking child.
                 */
                } else if (is_ip_address(curr_peer->addr->address,
-                                 curr_peer->addr->type, &i_netaddr)) {
+                                 curr_peer->addr->type, &peeraddr)) {
 
-                       AF(&peeraddr) = (u_short)i_netaddr.family;
                        SET_PORT(&peeraddr, NTP_PORT);
-                       if (AF_INET6 == i_netaddr.family)
-                               SET_ADDR6N(&peeraddr,
-                                          i_netaddr.type.in6);
-                       else
-                               SET_ADDR4N(&peeraddr,
-                                          i_netaddr.type.in.s_addr);
-
                        if (is_sane_resolved_address(&peeraddr,
                            curr_peer->host_mode))
                                peer_config(

diff --git a/ntpd/ntp_io.c b/ntpd/ntp_io.c
index b5dbb47e24f7a72a704ec796c8b794ab9ee042cd..7a0e402dda5efbe2aff58defbc5a2de10fd780ab 100644 (file)
--- a/ntpd/ntp_io.c
+++ b/ntpd/ntp_io.c
@@ -1235,7 +1235,7 @@ interface_action(
                    (if_name != NULL) ? if_name : "wildcard"));
 
        iswildcard = is_wildcard_addr(if_addr);
-       is_loopback = !!(INT_LOOPBACK & if_flags);
+       isloopback = !!(INT_LOOPBACK & if_flags);
 
        /*
         * Find any matching NIC rule from --interface / -I or ntp.conf