]> git.sur5r.net Git - openldap/commitdiff
ITS#6832
authorQuanah Gibson-Mount <quanah@openldap.org>
Thu, 24 Mar 2011 01:14:05 +0000 (01:14 +0000)
committerQuanah Gibson-Mount <quanah@openldap.org>
Thu, 24 Mar 2011 01:14:05 +0000 (01:14 +0000)
CHANGES
libraries/liblber/nt_err.c
libraries/libldap/init.c
libraries/liblutil/detach.c
libraries/liblutil/entropy.c

diff --git a/CHANGES b/CHANGES
index 1b2d288549a788ab9977d7fa8964b20422939508..3122749491c366b688852933a6d3c1f9d4ec3008 100644 (file)
--- 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)
index ced9f18804792867cc3db129d31c557c4d95125a..407d67307eae552f2d5f271c49aeead781d66d37 100644 (file)
@@ -17,7 +17,7 @@
 
 #ifdef HAVE_WINSOCK2
 #include <winsock2.h>
-#elif HAVE_WINSOCK
+#elif defined(HAVE_WINSOCK)
 #include <winsock.h>
 #endif /* HAVE_WINSOCK(2) */
 
index a2808b3bc73cef1c475ed5772bbfc7796bb292a5..26576fabd88a423a47de19ee9c2e9bf963d79702 100644 (file)
@@ -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;
index ad12e9c49d87c9e314be0a1bb302ba075277b8b1..dd89119ea84afa14077be0dadafd52952a8b7ab6 100644 (file)
@@ -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 );
index 47920fdcfde1f0f42117b1f96ae4c6b26b263529..ea887588ab75edc477945be3d2df0b86d72b4d44 100644 (file)
@@ -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;