Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
DISCONTINUED:openSUSE:11.1
nss_ldap
nss_ldap-defport-ssl-uri.dif
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File nss_ldap-defport-ssl-uri.dif of Package nss_ldap
Index: nss_ldap-262/ldap-nss.c =================================================================== --- nss_ldap-262.orig/ldap-nss.c +++ nss_ldap-262/ldap-nss.c @@ -1042,7 +1042,7 @@ do_init_session (LDAP ** ld, const char (void)do_init_krb5_cache(__config); # endif /* CONFIGURE_KRB5_KEYTAB */ #ifdef HAVE_LDAP_INITIALIZE - if (p == NULL && + if (p == NULL && defport != 0 && ((ldaps && defport != LDAPS_PORT) || (!ldaps && defport != LDAP_PORT))) { /* No port specified in URI and non-default port specified */ @@ -1586,9 +1586,13 @@ do_open (void) #endif /* HAVE_LDAP_START_TLS_S || HAVE_LDAP_START_TLS */ /* - * If SSL is desired, then enable it. + * If SSL is desired, either by the "ssl" option or if this + * is a "ldaps" URI, then enable it. */ - if (cfg->ldc_ssl_on == SSL_LDAPS) + if ( cfg->ldc_ssl_on == SSL_LDAPS || + strncasecmp(cfg->ldc_uris[__session.ls_current_uri], + "ldaps://", sizeof ("ldaps://") - 1) == 0 + ) { #if defined(HAVE_LDAP_SET_OPTION) && defined(LDAP_OPT_X_TLS) int tls = LDAP_OPT_X_TLS_HARD; Index: nss_ldap-262/util.c =================================================================== --- nss_ldap-262.orig/util.c +++ nss_ldap-262/util.c @@ -1276,10 +1276,6 @@ _nss_ldap_readconfig (ldap_config_t ** p { result->ldc_port = LDAPS_PORT; } - else - { - result->ldc_port = LDAP_PORT; - } } if (result->ldc_uris[0] == NULL)
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor