Clean up CLDAP stuff

diff --git a/libraries/libldap/init.c b/libraries/libldap/init.c
index 54c6ba5a4d1f4aa9f96dd1c9464819a97951631f..8c453154ae5acd7e21bb4b4e3c7a209dccb90ce5 100644 (file)
--- a/libraries/libldap/init.c
+++ b/libraries/libldap/init.c
@@ -399,6 +399,7 @@ void ldap_int_initialize_global_options( struct ldapoptions *gopts, int *dbglvl
 #ifdef LDAP_CONNECTIONLESS
        gopts->ldo_peer = NULL;
        gopts->ldo_cldapdn = NULL;
+       gopts->ldo_is_udp = 0;
 #endif
 
 #ifdef HAVE_CYRUS_SASL

diff --git a/libraries/libldap/ldap-int.h b/libraries/libldap/ldap-int.h
index fffaa610eca65f046da4d50c168ddbe3ad9d38cd..971412b26051bb901b53435b95469a0a94eb1aee 100644 (file)
--- a/libraries/libldap/ldap-int.h
+++ b/libraries/libldap/ldap-int.h
@@ -119,10 +119,10 @@ struct ldapoptions {
 #define LDAP_INITIALIZED       0x1
 #define LDAP_VALID_SESSION     0x2
 #ifdef LDAP_CONNECTIONLESS
-#define        LDAP_UDP_SESSION        0x4
-#define        LDAP_IS_UDP(ld)         (ld->ld_options.ldo_valid & LDAP_UDP_SESSION)
+#define        LDAP_IS_UDP(ld)         ((ld)->ld_options.ldo_is_udp)
        void*                   ldo_peer;       /* struct sockaddr* */
        char*                   ldo_cldapdn;
+       int                     ldo_is_udp;
 #endif
 
        int             ldo_debug;
@@ -301,7 +301,7 @@ struct ldap {
        LDAPConn        *ld_conns;      /* list of server connections */
        void            *ld_selectinfo; /* platform specifics for select */
 };
-#define LDAP_VALID(ld) ( (ld)->ld_valid & LDAP_VALID_SESSION )
+#define LDAP_VALID(ld) ( (ld)->ld_valid == LDAP_VALID_SESSION )
 
 #ifdef LDAP_R_COMPILE
 #include <ldap_pvt_thread.h>

diff --git a/libraries/libldap/open.c b/libraries/libldap/open.c
index 2010e83026bdb944ef3b666a69930162aef6a37c..a634cce5a79d1ab6cc870c25fb9c5890209e11b6 100644 (file)
--- a/libraries/libldap/open.c
+++ b/libraries/libldap/open.c
@@ -238,7 +238,7 @@ ldap_initialize( LDAP **ldp, LDAP_CONST char *url )
                }
 #ifdef LDAP_CONNECTIONLESS
                if (ldap_is_ldapc_url(url))
-                       ld->ld_options.ldo_valid |= LDAP_UDP_SESSION;
+                       LDAP_IS_UDP(ld) = 1;
 #endif
        }
 
@@ -303,7 +303,7 @@ ldap_int_open_connection(
                        } else {
                                host = srv->lud_host;
                        }
-                       ld->ld_options.ldo_valid |= LDAP_UDP_SESSION;
+                       LDAP_IS_UDP(ld) = 1;
                        rc = ldap_connect_to_host( ld, conn->lconn_sb,
                                proto, host, addr, port, async );