From: Harlan Stenn <stenn@ntp.org>
Date: Wed, 26 Oct 2005 00:15:47 +0000 (-0400)
Subject: [Bug 519] Allow dynamic SSL libraries
X-Git-Tag: NTP_4_2_0B_RC1~36^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5ad77052614f382e9f67e54599be3157c2434960;p=thirdparty%2Fntp.git

[Bug 519] Allow dynamic SSL libraries

bk: 435ecab37RnR0mEdjBf9AAmtuZsRlQ
---

diff --git a/configure.ac b/configure.ac
index c9586cef9..4232976f8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2784,7 +2784,7 @@ AC_ARG_WITH(openssl-libdir,
 case "$ans" in
  no) ;;
  yes) # Look in:
-    ans="/usr/lib /usr/lib/openssl /usr/local/lib /usr/local/ssl/lib"
+    ans="/usr/lib /usr/lib/openssl /usr/sfw/lib /usr/local/lib /usr/local/ssl/lib"
     ;;
  *) # Look where they said
     ;;
@@ -2799,6 +2799,7 @@ case "$ans" in
 	    test -f $i/libcrypto.dylib -a -f $i/libssl.dylib && break
 	    ;;
 	 *)
+	    test -f $i/libcrypto.so -a -f $i/libssl.so && break
 	    test -f $i/libcrypto.a -a -f $i/libssl.a && break
 	    ;;
 	esac
@@ -2823,7 +2824,7 @@ AC_ARG_WITH(openssl-incdir,
 case "$ans" in
  no) ;;
  yes) # look in:
-    ans="/usr/include /usr/local/include /usr/local/ssl/include"
+    ans="/usr/include /usr/sfw/include /usr/local/include /usr/local/ssl/include"
     ;;
  *) # Look where they said
     ;;
diff --git a/ntpd/ntpd.c b/ntpd/ntpd.c
index b03bbfc0f..64739a491 100644
--- a/ntpd/ntpd.c
+++ b/ntpd/ntpd.c
@@ -449,6 +449,15 @@ ntpdmain(
 	}
 #endif
 
+#ifdef OPENSSL
+	if ((SSLeay() ^ OPENSSL_VERSION_NUMBER) & ~0xff0L) {
+		msyslog(LOG_ERR,
+		    "ntpd: OpenSSL version mismatch. Built against %lx, you have %lx\n",
+		    OPENSSL_VERSION_NUMBER, SSLeay());
+		exit(1);
+	}
+#endif
+
 #ifdef SYS_WINNT
 	/*
 	 * Initialize the time structures and variables