[src/trunk]: src/dist/ntp/ntpdate Resolve conflicts.

[simonb <simonb%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/1535b79bd3e5
branches:  trunk
changeset: 485217:1535b79bd3e5
user:      simonb <simonb%NetBSD.org@localhost>
date:      Sat Apr 22 15:04:49 2000 +0000

description:
Resolve conflicts.

diffstat:

 dist/ntp/ntpdate/ntptimeset.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (32 lines):

diff -r 1784875b2d6e -r 1535b79bd3e5 dist/ntp/ntpdate/ntptimeset.c
--- a/dist/ntp/ntpdate/ntptimeset.c     Sat Apr 22 15:00:41 2000 +0000
+++ b/dist/ntp/ntpdate/ntptimeset.c     Sat Apr 22 15:04:49 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ntptimeset.c,v 1.2 2000/04/17 05:49:54 simonb Exp $    */
+/*     $NetBSD: ntptimeset.c,v 1.3 2000/04/22 15:04:49 simonb Exp $    */
 
 /*
  * ntptimeset - get/set the time via ntp
@@ -893,7 +893,7 @@
        if (sys_authenticate) {
                int len;
 
-               xpkt.keyid1 = htonl(sys_authkey);
+               xpkt.exten[0] = htonl(sys_authkey);
                get_systime(&server->xmt);
                L_ADDUF(&server->xmt, sys_authdelay);
                HTONL_FP(&server->xmt, &xpkt.xmt);
@@ -1052,11 +1052,11 @@
 
                if (debug > 3)
                        printf("receive: rpkt keyid=%ld sys_authkey=%ld decrypt=%ld\n",
-                          (long int)ntohl(rpkt->keyid1), (long int)sys_authkey,
+                          (long int)ntohl(rpkt->exten[0]), (long int)sys_authkey,
                           (long int)authdecrypt(sys_authkey, (u_int32 *)rpkt,
                                LEN_PKT_NOMAC, (int)(rbufp->recv_length - LEN_PKT_NOMAC)));
 
-               if (has_mac && ntohl(rpkt->keyid1) == sys_authkey &&
+               if (has_mac && ntohl(rpkt->exten[0]) == sys_authkey &&
                        authdecrypt(sys_authkey, (u_int32 *)rpkt, LEN_PKT_NOMAC,
                        (int)(rbufp->recv_length - LEN_PKT_NOMAC)))
                        is_authentic = 1;