Fix Max OS X openssl checks. Fix some warnings.

configure

@@ -7173,7 +7173,7 @@ $as_echo_n "checking for SSL headers... " >&6; }
 				{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL libraries" >&5
 $as_echo_n "checking for SSL libraries... " >&6; }
 		found_ssl=no
-		for dir in $ssl_lib_dir $ssl_dir $ssl_dir/lib $ssl_dir/lib64 /usr/lib64 \
+		for dir in $ssl_lib_dir $ssldir $ssldir/lib $ssldir/lib64 /usr/lib64 \
 					/usr/lib /usr/lib/x86_64-linux-gnu /usr/lib/i386-linux-gnu \
 					/usr/local/lib /usr/lib/ssl /usr/ssl/lib /usr/openssl/lib \
 					/usr/pkg/lib /usr/freeware/lib/openssl /usr/sfw/lib \
@@ -7221,7 +7221,7 @@ else
   ;;
   *)
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $ssldir/sbin/openssl$PATH_SEPARATOR$ssldir/bin/openssl$PATH_SEPARATOR$PATH
+for as_dir in $ssldir/sbin$PATH_SEPARATOR$ssldir/bin$PATH_SEPARATOR$PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.

configure.ac

@@ -376,7 +376,7 @@ if test x$check_for_ssl = xyes; then
 		dnl Now try and find SSL libraries
 		AC_MSG_CHECKING(for SSL libraries)
 		found_ssl=no
-		for dir in $ssl_lib_dir $ssl_dir $ssl_dir/lib $ssl_dir/lib64 /usr/lib64 \
+		for dir in $ssl_lib_dir $ssldir $ssldir/lib $ssldir/lib64 /usr/lib64 \
 					/usr/lib /usr/lib/x86_64-linux-gnu /usr/lib/i386-linux-gnu \
 					/usr/local/lib /usr/lib/ssl /usr/ssl/lib /usr/openssl/lib \
 					/usr/pkg/lib /usr/freeware/lib/openssl /usr/sfw/lib \
@@ -407,7 +407,7 @@ if test x$check_for_ssl = xyes; then
 
 			AC_DEFINE_UNQUOTED(HAVE_SSL,[1],[Have SSL support])
 	
-			AC_PATH_PROG(sslbin,openssl,value-if-not-found,$ssldir/sbin/openssl$PATH_SEPARATOR$ssldir/bin/openssl$PATH_SEPARATOR$PATH)
+			AC_PATH_PROG(sslbin,openssl,value-if-not-found,$ssldir/sbin$PATH_SEPARATOR$ssldir/bin$PATH_SEPARATOR$PATH)
 
 			dnl Generate DH parameters
 			if test -f "$sslbin"; then

src/check_nrpe.c

@@ -1037,10 +1037,10 @@ int read_packet(int sock, void *ssl_ptr, v2_packet * v2_pkt, v3_packet ** v3_pkt
 			if (bytes_read != buffer_size) {
 				if (packet_ver == NRPE_PACKET_VERSION_3)
 					printf("CHECK_NRPE: Receive buffer size - %ld bytes received "
-						   "(%ld expected).\n", bytes_read, sizeof(buffer_size));
+						   "(%ld expected).\n", (long)bytes_read, sizeof(buffer_size));
 				else
 					printf("CHECK_NRPE: Receive underflow - only %ld bytes received "
-						   "(%ld expected).\n", bytes_read, sizeof(buffer_size));
+						   "(%ld expected).\n", (long)bytes_read, sizeof(buffer_size));
 			}
 			return -1;
 		} else
@@ -1059,7 +1059,7 @@ int verify_callback(int preverify_ok, X509_STORE_CTX * ctx)
 	int err;
 	SSL *ssl;
 
-	if (preverify_ok || (sslprm.log_opts & SSL_LogCertDetails == 0))
+	if (preverify_ok || ((sslprm.log_opts & SSL_LogCertDetails) == 0))
 		return preverify_ok;
 
 	err_cert = X509_STORE_CTX_get_current_cert(ctx);

src/nrpe.c

@@ -590,7 +590,7 @@ int verify_callback(int preverify_ok, X509_STORE_CTX * ctx)
 	int       err;
 	SSL      *ssl;
 
-	if (preverify_ok || (sslprm.log_opts & SSL_LogCertDetails == 0))
+	if (preverify_ok || ((sslprm.log_opts & SSL_LogCertDetails) == 0))
 		return preverify_ok;
 
 	err_cert = X509_STORE_CTX_get_current_cert(ctx);