From: Harlan Stenn <stenn@ntp.org>
Date: Sun, 31 Mar 2002 02:35:07 +0000 (-0500)
Subject: Merge resolution
X-Git-Tag: NTP_4_1_73~168
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1a584144cefd262e061c8e0231d199979bbcd43b;p=thirdparty%2Fntp.git

Merge resolution

bk: 3ca675dbx35Y6tAxCtvEtNQVzVtrAw
---

1a584144cefd262e061c8e0231d199979bbcd43b
diff --cc ntpd/ntp_proto.c
index e534bce488,28a3393337..921bf5b95a
--- a/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 */