Merge resolution

bk: 3ca675dbx35Y6tAxCtvEtNQVzVtrAw

diff --cc ntpd/ntp_proto.c
index e534bce488986359a0c8e4f7afe48118985b8ec2,28a3393337f76d25a4e1195eb38177d01f8ef6ba..921bf5b95a9d0e93cffb2d69d45099b335bcc497
--- 1/ntpd/ntp_proto.c
--- 2/ntpd/ntp_proto.c
+++ b/ntpd/ntp_proto.c
@@@ -287,10 -286,10 +287,10 @@@ receive
        int     authlen;                /* offset of MAC field */
        int     is_authentic;           /* cryptosum ok */
        keyid_t skeyid;                 /* cryptographic keys */
 -      struct sockaddr_in *dstadr_sin; /* active runway */
 +      struct sockaddr_storage *dstadr_sin;    /* active runway */
+       l_fp    p_org;                  /* originate timestamp */
  #ifdef OPENSSL
        keyid_t pkeyid, tkeyid;         /* cryptographic keys */
-       l_fp    p_org;                  /* originate timestamp */
        struct autokey *ap;             /* autokey structure pointer */
        struct peer *peer2;             /* aux peer structure pointer */
  #endif /* OPENSSL */