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

fix ldap namespace (part of ITS#5974)

Browse source
This commit is contained in:
Pierangelo Masarati 2009-02-24 21:09:41 +00:00
parent 47011649f7
commit 0d6e859846
7 changed files with 9 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/ldap_pvt.h
View file

@ -351,7 +351,7 @@ LDAP_F( struct berval * )
ldap_pvt_str2lowerbv LDAP_P(( char *str, struct berval *bv ));
/* tls.c */
LDAP_F (int) ldap_int_tls_config LDAP_P(( struct ldap *ld,
LDAP_F (int) ldap_pvt_tls_config LDAP_P(( struct ldap *ld,
int option, const char *arg ));
LDAP_F (int) ldap_pvt_tls_get_option LDAP_P(( struct ldap *ld,
int option, void *arg ));

4
libraries/libldap/init.c
View file

@ -275,7 +275,7 @@ static void openldap_ldap_init_w_conf(
break;
case ATTR_TLS:
#ifdef HAVE_TLS
ldap_int_tls_config( NULL, attrs[i].offset, opt );
ldap_pvt_tls_config( NULL, attrs[i].offset, opt );
#endif
break;
case ATTR_OPT_TV: {
@ -429,7 +429,7 @@ static void openldap_ldap_init_w_env(
break;
case ATTR_TLS:
#ifdef HAVE_TLS
ldap_int_tls_config( NULL, attrs[i].offset, value );
ldap_pvt_tls_config( NULL, attrs[i].offset, value );
#endif
break;
}

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

@ -486,14 +486,6 @@ LDAP_F (void) ldap_int_utils_init LDAP_P(( void ));
*/
LDAP_F (int) ldap_log_printf LDAP_P((LDAP *ld, int level, const char *fmt, ...)) LDAP_GCCATTR((format(printf, 3, 4)));
/*
* in cache.c
*/
LDAP_F (void) ldap_add_request_to_cache LDAP_P(( LDAP *ld, ber_tag_t msgtype,
BerElement *request ));
LDAP_F (void) ldap_add_result_to_cache LDAP_P(( LDAP *ld, LDAPMessage *result ));
LDAP_F (int) ldap_check_cache LDAP_P(( LDAP *ld, ber_tag_t msgtype, BerElement *request ));
/*
* in controls.c
*/
@ -680,9 +672,6 @@ LDAP_F (char *) ldap_int_parse_numericoid LDAP_P((
/*
* in tls.c
*/
LDAP_F (int) ldap_int_tls_config LDAP_P(( LDAP *ld,
int option, const char *arg ));
LDAP_F (int) ldap_int_tls_start LDAP_P(( LDAP *ld,
LDAPConn *conn, LDAPURLDesc *srv ));

2
libraries/libldap/tls.c
View file

@ -2111,7 +2111,7 @@ ldap_pvt_tls_check_hostname( LDAP *ld, void *s, const char *name_in )
#endif
int
ldap_int_tls_config( LDAP *ld, int option, const char *arg )
ldap_pvt_tls_config( LDAP *ld, int option, const char *arg )
{
int i;

2
libraries/libldap/tls2.c
View file

@ -500,7 +500,7 @@ ldap_pvt_tls_check_hostname( LDAP *ld, void *s, const char *name_in )
}
int
ldap_int_tls_config( LDAP *ld, int option, const char *arg )
ldap_pvt_tls_config( LDAP *ld, int option, const char *arg )
{
int i;

2
servers/slapd/bconfig.c
View file

@ -3249,7 +3249,7 @@ config_tls_config(ConfigArgs *c) {
}
return(ldap_pvt_tls_set_option(slap_tls_ld, flag, &i));
} else {
return(ldap_int_tls_config(slap_tls_ld, flag, c->argv[1]));
return(ldap_pvt_tls_config(slap_tls_ld, flag, c->argv[1]));
}
}
#endif

6
servers/slapd/config.c
View file

@ -1607,7 +1607,7 @@ int bindconf_tls_set( slap_bindconf *bc, LDAP *ld )
}
}
if ( bc->sb_tls_reqcert ) {
rc = ldap_int_tls_config( ld, LDAP_OPT_X_TLS_REQUIRE_CERT,
rc = ldap_pvt_tls_config( ld, LDAP_OPT_X_TLS_REQUIRE_CERT,
bc->sb_tls_reqcert );
if ( rc ) {
Debug( LDAP_DEBUG_ANY,
@ -1618,7 +1618,7 @@ int bindconf_tls_set( slap_bindconf *bc, LDAP *ld )
newctx = 1;
}
if ( bc->sb_tls_protocol_min ) {
rc = ldap_int_tls_config( ld, LDAP_OPT_X_TLS_PROTOCOL_MIN,
rc = ldap_pvt_tls_config( ld, LDAP_OPT_X_TLS_PROTOCOL_MIN,
bc->sb_tls_protocol_min );
if ( rc ) {
Debug( LDAP_DEBUG_ANY,
@ -1630,7 +1630,7 @@ int bindconf_tls_set( slap_bindconf *bc, LDAP *ld )
}
#ifdef HAVE_OPENSSL_CRL
if ( bc->sb_tls_crlcheck ) {
rc = ldap_int_tls_config( ld, LDAP_OPT_X_TLS_CRLCHECK,
rc = ldap_pvt_tls_config( ld, LDAP_OPT_X_TLS_CRLCHECK,
bc->sb_tls_crlcheck );
if ( rc ) {
Debug( LDAP_DEBUG_ANY,