Fixes from John Hay.

bk: 3d2c6bf3z1Uu6HHe7YG_e3YDWVXpfQ

diff --git a/libntp/decodenetnum.c b/libntp/decodenetnum.c
index c963027bcb199ea08ad06deac4ee2ec161aae8a1..23aed0b244984c79b17148c4962579ecfa6e0721 100644 (file)
--- a/libntp/decodenetnum.c
+++ b/libntp/decodenetnum.c
@@ -26,7 +26,7 @@ decodenetnum(
                cp++;
                for (i = 0; *cp != ']'; cp++, i++)
                        name[i] = *cp;
-       name[i] = '/0';
+       name[i] = '\0';
        num = name; 
        }
        bzero(&hints, sizeof(struct addrinfo));

diff --git a/ntpd/ntp_refclock.c b/ntpd/ntp_refclock.c
index 7f6e92a6bbc3661fa9285ee56c33cc454d87b7f4..a3ebbb46ae2fac819614877e78dc75fa533b7b0f 100644 (file)
--- a/ntpd/ntp_refclock.c
+++ b/ntpd/ntp_refclock.c
@@ -224,9 +224,6 @@ refclock_newpeer(
        peer->refclktype = clktype;
        peer->refclkunit = unit;
        peer->flags |= FLAG_REFCLOCK;
-       peer->stratum = STRATUM_REFCLOCK;
-       /* peer->refid = peer->srcadr.sin_addr.s_addr;*/
-       peer->refid = 0;                                /* REFID case to solve */
        peer->maxpoll = peer->minpoll;
        peer->stratum = STRATUM_REFCLOCK;
        pp->type = clktype;
@@ -255,11 +252,7 @@ refclock_newpeer(
        }
        peer->hpoll = peer->minpoll;
        peer->ppoll = peer->maxpoll;
-       if (peer->stratum <= 1)
-               peer->refid = pp->refid;
-       else
-               /* Here it is IPv4 address, so we don't have problem with REDIF case */
-               peer->refid = ((struct sockaddr_in*)&peer->srcadr)->sin_addr.s_addr;
+       peer->refid = pp->refid;
        return (1);
 }