From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Thu, 24 Mar 2011 01:14:05 +0000 (+0000)
Subject: ITS#6832
X-Git-Tag: OPENLDAP_REL_ENG_2_4_25~36
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=fed6d41e2a90781a68f8a42ca9b303fe8f3a7ad3;p=openldap

ITS#6832
---

diff --git a/CHANGES b/CHANGES
index 1b2d288549..3122749491 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,7 @@
 OpenLDAP 2.4 Change Log
 
 OpenLDAP 2.4.25 Engineering
+	Fixed libldap/lberl/util if/else usage (ITS#6832)
 
 OpenLDAP 2.4.24 Release (2011/02/10)
 	Added LDIF line wrapping setting (ITS#6645)
diff --git a/libraries/liblber/nt_err.c b/libraries/liblber/nt_err.c
index ced9f18804..407d67307e 100644
--- a/libraries/liblber/nt_err.c
+++ b/libraries/liblber/nt_err.c
@@ -17,7 +17,7 @@
 
 #ifdef HAVE_WINSOCK2
 #include <winsock2.h>
-#elif HAVE_WINSOCK
+#elif defined(HAVE_WINSOCK)
 #include <winsock.h>
 #endif /* HAVE_WINSOCK(2) */
 
diff --git a/libraries/libldap/init.c b/libraries/libldap/init.c
index a2808b3bc7..26576fabd8 100644
--- a/libraries/libldap/init.c
+++ b/libraries/libldap/init.c
@@ -626,7 +626,7 @@ void ldap_int_initialize( struct ldapoptions *gopts, int *dbglvl )
 	    return; 
 	}
 }	/* The WinSock DLL is acceptable. Proceed. */
-#elif HAVE_WINSOCK
+#elif defined(HAVE_WINSOCK)
 {	WSADATA wsaData;
 	if ( WSAStartup( 0x0101, &wsaData ) != 0 ) {
 	    return;
diff --git a/libraries/liblutil/detach.c b/libraries/liblutil/detach.c
index ad12e9c49d..dd89119ea8 100644
--- a/libraries/liblutil/detach.c
+++ b/libraries/liblutil/detach.c
@@ -128,7 +128,7 @@ lutil_detach( int debug, int do_close )
 
 #ifdef HAVE_SETSID
 		(void) setsid();
-#elif TIOCNOTTY
+#elif defined(TIOCNOTTY)
 		if ( (sd = open( "/dev/tty", O_RDWR )) != -1 ) {
 			(void) ioctl( sd, TIOCNOTTY, NULL );
 			(void) close( sd );
diff --git a/libraries/liblutil/entropy.c b/libraries/liblutil/entropy.c
index 47920fdcfd..ea887588ab 100644
--- a/libraries/liblutil/entropy.c
+++ b/libraries/liblutil/entropy.c
@@ -73,7 +73,7 @@ int lutil_entropy( unsigned char *buf, ber_len_t nbytes )
 		close(fd);
 		return nbytes > 0 ? -1 : 0;
 	}
-#elif PROV_RSA_FULL
+#elif defined(PROV_RSA_FULL)
 	{
 		/* Not used since _WIN32_WINNT not set... */
 		HCRYPTPROV hProv = 0;