From: Howard Chu Date: Fri, 28 Sep 2001 22:19:51 +0000 (+0000) Subject: Clean up CLDAP stuff X-Git-Tag: LDBM_PRE_GIANT_RWLOCK~1035 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=e80b5d4040da74165f60e6a7f78f8fc9e4ee6500;p=openldap Clean up CLDAP stuff --- diff --git a/libraries/libldap/init.c b/libraries/libldap/init.c index 54c6ba5a4d..8c453154ae 100644 --- 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 fffaa610ec..971412b260 100644 --- 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 diff --git a/libraries/libldap/open.c b/libraries/libldap/open.c index 2010e83026..a634cce5a7 100644 --- 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 );