Hello community, here is the log from the commit of package nss_ldap checked in at Tue Oct 28 18:08:41 CET 2008. -------- --- nss_ldap/nss_ldap.changes 2008-08-28 12:17:24.000000000 +0200 +++ /mounts/work_src_done/STABLE/nss_ldap/nss_ldap.changes 2008-10-28 16:05:47.000000000 +0100 @@ -1,0 +2,7 @@ +Tue Oct 28 16:00:52 CET 2008 - rhafer@suse.de + +- Only set default port when "port" directive is present in + /etc/ldap.conf or when "ssl on" is set. (bnc#439449) +- Apply "tls_*" options when "ldaps" URI are used (bnc#439449) + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- nss_ldap-defport-ssl-uri.dif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nss_ldap.spec ++++++ --- /var/tmp/diff_new_pack.LV4034/_old 2008-10-28 18:07:46.000000000 +0100 +++ /var/tmp/diff_new_pack.LV4034/_new 2008-10-28 18:07:46.000000000 +0100 @@ -25,13 +25,14 @@ PreReq: sed coreutils /usr/bin/grep /bin/mktemp AutoReqProv: on Version: 262 -Release: 1 +Release: 10 Summary: NSS LDAP Module Url: http://www.padl.com/OSS/nss_ldap.html Source: nss_ldap-%{version}.tar.bz2 Source1: README.SuSE Patch: nss_ldap.dif -Patch2: group-utf8.dif +Patch1: group-utf8.dif +Patch2: nss_ldap-defport-ssl-uri.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -49,6 +50,7 @@ %prep %setup -q %patch -p1 +%patch1 -p1 %patch2 -p1 cp -v %{S:1} . @@ -105,6 +107,10 @@ %doc %{_mandir}/man5/nss_ldap.5* %changelog +* Tue Oct 28 2008 rhafer@suse.de +- Only set default port when "port" directive is present in + /etc/ldap.conf or when "ssl on" is set. (bnc#439449) +- Apply "tls_*" options when "ldaps" URI are used (bnc#439449) * Thu Aug 28 2008 rhafer@suse.de - Update to nss_ldap-262, fixes a minor bug in the default config file (PADL-Bug#371) and a build issue on Solaris @@ -243,7 +249,7 @@ - Updated to version 207. * Sat Feb 15 2003 kukuk@suse.de - Update to 203.7. Includes netgroup support. -* Sat Feb 15 2003 kukuk@suse.de +* Fri Feb 14 2003 kukuk@suse.de - Fix seg.fault on x86-64 in gethost* functions - Implement IPv6 support for gethost* functions * Thu Feb 13 2003 kukuk@suse.de @@ -295,7 +301,7 @@ - link against ldaplib2 * Mon Dec 11 2000 kukuk@suse.de - Update to 123 -* Sun Nov 05 2000 kukuk@suse.de +* Sat Nov 04 2000 kukuk@suse.de - Use ldaplib * Thu Jun 01 2000 kukuk@suse.de - Update to 110 ++++++ nss_ldap-defport-ssl-uri.dif ++++++ 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) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org