[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-1034-gca526fb

[Andrew Bartlett]

The branch, master has been updated
       via  ca526fbb3ee4131f1dae2b68f5f0f6b8c49ff711 (commit)
       via  7496095c1b119c1e4f99d985b6dca6ee68dcb520 (commit)
      from  df3ef12cf858290ffcef650a23d32ec2271648b0 (commit)

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


- Log -----------------------------------------------------------------
commit ca526fbb3ee4131f1dae2b68f5f0f6b8c49ff711
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Fri Aug 14 17:51:14 2009 +1000

    s4:selftest Remove the 'subunit filter' from make testenv etc
    
    The extra filter is no use for 'testenv', as we are not running tests,
    but an xterm.  The filter also breaks running 'GDB_PROVISION=yes make
    test', but at least if we can run 'GDB_PROVISION=yes make testenv'
    then we can debug provision.
    
    Andrew Bartlett

commit 7496095c1b119c1e4f99d985b6dca6ee68dcb520
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Fri Aug 14 17:50:18 2009 +1000

    s4:libcli/ldap Explain why we set a hostname for ldapi:// connections
    
    It is a pretty odd thing to do, and it's only because of the
    restrictions of DIGEST-MD5 in Cyrus SASL that we do it.
    
    Andrew Bartlett

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

Summary of changes:
 source4/libcli/ldap/ldap_client.c |    4 +++-
 source4/selftest/config.mk        |    4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/libcli/ldap/ldap_client.c b/source4/libcli/ldap/ldap_client.c
index 9135b42..d278f40 100644
--- a/source4/libcli/ldap/ldap_client.c
+++ b/source4/libcli/ldap/ldap_client.c
@@ -335,7 +335,9 @@ _PUBLIC_ struct composite_context *ldap_connect_send(struct ldap_connection *con
 		SMB_ASSERT(sizeof(protocol)>10);
 		SMB_ASSERT(sizeof(path)>1024);
 	
-		/* LDAPI connections are to localhost, so give the local host name as the target for gensec */
+		/* LDAPI connections are to localhost, so give the
+		 * local host name as the target for gensec's
+		 * DIGEST-MD5 mechanism */
 		conn->host = talloc_asprintf(conn, "%s.%s", lp_netbios_name(conn->lp_ctx),  lp_realm(conn->lp_ctx));
 		if (composite_nomem(conn->host, state->ctx)) {
 			return result;
diff --git a/source4/selftest/config.mk b/source4/selftest/config.mk
index 27ea35d..51aa771 100644
--- a/source4/selftest/config.mk
+++ b/source4/selftest/config.mk
@@ -58,10 +58,10 @@ quicktestone:: all
 	$(SELFTEST) $(SELFTEST_QUICK_OPTS) --socket-wrapper --one $(TESTS) | $(FORMAT_TEST_OUTPUT)
 
 testenv:: everything
-	$(SELFTEST) $(SELFTEST_NOSLOW_OPTS) --socket-wrapper --testenv | $(FORMAT_TEST_OUTPUT)
+	$(SELFTEST) $(SELFTEST_NOSLOW_OPTS) --socket-wrapper --testenv
 
 testenv-%:: everything
-	SELFTEST_TESTENV=$* $(SELFTEST) $(SELFTEST_NOSLOW_OPTS) --socket-wrapper --testenv | $(FORMAT_TEST_OUTPUT)
+	SELFTEST_TESTENV=$* $(SELFTEST) $(SELFTEST_NOSLOW_OPTS) --socket-wrapper --testenv
 
 test-%:: 
 	$(MAKE) test TESTS=$*


-- 
Samba Shared Repository