[SCM] Samba Shared Repository - branch master updated

Björn Jacke bjacke at samba.org
Tue Jan 2 17:02:02 UTC 2018


The branch, master has been updated
       via  7277590 smbldap: don't try start tls on ldaps:// connections
       via  e29d31f doc-xml: fix dependency as the  xml targets depend on Makefile.settings
      from  d8d21ec Happy New Year 2018!

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 7277590f6d746113ff347c7fce3d8ef4d01cc715
Author: Bjoern Jacke <bjacke at samba.org>
Date:   Thu Dec 7 16:06:38 2017 +0100

    smbldap: don't try start tls on ldaps:// connections
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=6079
    
    Signed-off-by: Bjoern Jacke <bjacke at samba.org>
    Reviewed-by: Volker Lendecke <vl at samba.org>
    
    Autobuild-User(master): Björn Jacke <bj at sernet.de>
    Autobuild-Date(master): Tue Jan  2 18:01:17 CET 2018 on sn-devel-144

commit e29d31f74f4c2a0f1127d9fb92118b6e42763bf1
Author: Björn Jacke <bjacke at samba.org>
Date:   Wed Dec 13 13:39:10 2017 +0100

    doc-xml: fix dependency as the  xml targets depend on Makefile.settings
    
    Signed-off-by: Bjoern Jacke <bjacke at samba.org>
    Reviewed-by: Stefan Metzmacher <metze at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 docs-xml/Makefile     | 2 +-
 source3/lib/smbldap.c | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/docs-xml/Makefile b/docs-xml/Makefile
index 6a33b17..d69238b 100644
--- a/docs-xml/Makefile
+++ b/docs-xml/Makefile
@@ -92,7 +92,7 @@ $(DOCBOOKDIR)/%.xml: %/index.xml xslt/expand-sambadoc.xsl
 	@mkdir -p $(@D)
 	@$(XSLTPROC) --stringparam latex.imagebasedir "$*/"  --stringparam noreference 0  --xinclude --output $@ xslt/expand-sambadoc.xsl $<
 
-$(DOCBOOKDIR)/manpages/%.xml: $(MANPAGEDIR)/%.xml xslt/expand-sambadoc.xsl
+$(DOCBOOKDIR)/manpages/%.xml: $(MANPAGEDIR)/%.xml xslt/expand-sambadoc.xsl Makefile.settings
 	@mkdir -p $(@D)
 	$(XSLTPROC) --xinclude --stringparam noreference 0 --output $@ xslt/expand-sambadoc.xsl $<
 
diff --git a/source3/lib/smbldap.c b/source3/lib/smbldap.c
index 71166f6..5a67ab7 100644
--- a/source3/lib/smbldap.c
+++ b/source3/lib/smbldap.c
@@ -604,7 +604,7 @@ static void smbldap_store_state(LDAP *ld, struct smbldap_state *smbldap_state)
 int smbldap_start_tls(LDAP *ldap_struct, int version)
 { 
 #ifdef LDAP_OPT_X_TLS
-	int rc;
+	int rc,tls;
 #endif
 
 	if (lp_ldap_ssl() != LDAP_SSL_START_TLS) {
@@ -612,6 +612,12 @@ int smbldap_start_tls(LDAP *ldap_struct, int version)
 	}
 
 #ifdef LDAP_OPT_X_TLS
+	/* check if we use ldaps already */
+	ldap_get_option(ldap_struct, LDAP_OPT_X_TLS, &tls);
+	if (tls == LDAP_OPT_X_TLS_HARD) {
+		return LDAP_SUCCESS;
+	}
+
 	if (version != LDAP_VERSION3) {
 		DEBUG(0, ("Need LDAPv3 for Start TLS\n"));
 		return LDAP_OPERATIONS_ERROR;


-- 
Samba Shared Repository



More information about the samba-cvs mailing list