Sophie

Sophie

distrib > Mandriva > 2009.0 > i586 > by-pkgid > d89c1300abab2ee67a52a0999f0c77ae > files > 12

ntp-4.2.4-18mdv2009.0.src.rpm

diff -Naurp ntp-4.2.4p4/ntpd/ntpd.c ntp-4.2.4p4.oden/ntpd/ntpd.c
--- ntp-4.2.4p4/ntpd/ntpd.c	2007-09-11 01:55:16.000000000 +0200
+++ ntp-4.2.4p4.oden/ntpd/ntpd.c	2008-05-30 15:14:40.000000000 +0200
@@ -507,7 +507,7 @@ ntpdmain(
 #endif
 
 #ifdef OPENSSL
-	if ((SSLeay() ^ OPENSSL_VERSION_NUMBER) & ~0xff0L) {
+	if ((SSLeay() >> 12) != (OPENSSL_VERSION_NUMBER >> 12)) {
 		msyslog(LOG_ERR,
 		    "ntpd: OpenSSL version mismatch. Built against %lx, you have %lx\n",
 		    OPENSSL_VERSION_NUMBER, SSLeay());
diff -Naurp ntp-4.2.4p4/util/ntp-keygen.c ntp-4.2.4p4.oden/util/ntp-keygen.c
--- ntp-4.2.4p4/util/ntp-keygen.c	2007-09-11 01:55:16.000000000 +0200
+++ ntp-4.2.4p4.oden/util/ntp-keygen.c	2008-05-30 15:13:31.000000000 +0200
@@ -259,7 +259,7 @@ main(
 	 * OpenSSL version numbers: MNNFFPPS: major minor fix patch status
 	 * We match major, minor, fix and status (not patch)
 	 */
-	if ((SSLeay() ^ OPENSSL_VERSION_NUMBER) & ~0xff0L) {
+	if ((SSLeay() >> 12) != (OPENSSL_VERSION_NUMBER >> 12)) {
 		fprintf(stderr,
 		    "OpenSSL version mismatch. Built against %lx, you have %lx\n",
 		    OPENSSL_VERSION_NUMBER, SSLeay());