Clean up CLDAP stuff

This commit is contained in:
Howard Chu 2001-09-28 22:19:51 +00:00
parent 7bf6698692
commit e80b5d4040
3 changed files with 6 additions and 5 deletions

View file

@ -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

View file

@ -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>

View file

@ -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 );