upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-26 01:29:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Eliminate second session protocol version field.

Browse source
This commit is contained in:
Kurt Zeilenga 2000-02-18 19:57:38 +00:00
parent 6c6ecc15d5
commit 6cb60f381a
3 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libraries/libldap/ldap-int.h
View file

@ -99,7 +99,7 @@ struct ldapoptions {
struct timeval *ldo_tm_api;
struct timeval *ldo_tm_net;
ber_int_t ldo_version; /* version to connect at */
ber_int_t ldo_version;
ber_int_t ldo_deref;
ber_int_t ldo_timelimit;
ber_int_t ldo_sizelimit;
@ -234,7 +234,7 @@ struct ldap {
#define ld_sctrls ld_options.ldo_sctrls
#define ld_cctrls ld_options.ldo_cctrls
ber_int_t ld_version; /* version connected at */
#define ld_version ld_options.ldo_version
char *ld_host;
int ld_port;

3
libraries/libldap/open.c
View file

@ -161,9 +161,6 @@ ldap_create( LDAP **ldp )
#endif /* LDAP_CHARSET_8859 == LDAP_DEFAULT_CHARSET */
#endif /* STR_TRANSLATION && LDAP_DEFAULT_CHARSET */
/* we'll assume we're talking version 2 for now */
ld->ld_version = LDAP_VERSION2;
ber_pvt_sb_init( &(ld->ld_sb) );
*ldp = ld;

6
libraries/libldap/options.c
View file

@ -198,11 +198,7 @@ ldap_get_option(
return LDAP_OPT_SUCCESS;
case LDAP_OPT_PROTOCOL_VERSION:
if ((ld != NULL) && ld->ld_version) {
* (int *) outvalue = ld->ld_version;
} else {
* (int *) outvalue = lo->ldo_version;
}
* (int *) outvalue = lo->ldo_version;
return LDAP_OPT_SUCCESS;
case LDAP_OPT_SERVER_CONTROLS: