[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-test-2684-g2bd3b7d

Volker Lendecke vl at samba.org
Fri Feb 29 21:36:24 GMT 2008


The branch, v3-2-test has been updated
       via  2bd3b7d474768f842921945d283eac10da2a1684 (commit)
       via  f2c67803792f1fd3929e922c1f626f8247e08992 (commit)
      from  5f592d030b7e94331a634e0d625aefc60cfb1f70 (commit)

http://gitweb.samba.org/?samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit 2bd3b7d474768f842921945d283eac10da2a1684
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Feb 29 22:38:10 2008 +0100

    Restore 3.0 behaviour with empty /etc/hosts
    
    Jeremy, in 3.0 we allowed get_mydnsdomname and get_mydnsfullname to fail
    without filling in anything useful. Worked fine. Without this patch and a empty
    /etc/hosts and no DNS configured, session setup would return
    NT_STATUS_BAD_NETWORK_NAME. This is confusing at best, BAD_NETWORK_NAME afaik
    is only ever returned from tcon normally.
    
    This restores the 3.0 behaviour.
    
    Comments?
    
    Volker

commit f2c67803792f1fd3929e922c1f626f8247e08992
Author: Volker Lendecke <vl at samba.org>
Date:   Fri Feb 29 22:33:35 2008 +0100

    Check the right variable for being NULL

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

Summary of changes:
 source/libsmb/ntlmssp.c |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/libsmb/ntlmssp.c b/source/libsmb/ntlmssp.c
index 35c20ed..7082ea7 100644
--- a/source/libsmb/ntlmssp.c
+++ b/source/libsmb/ntlmssp.c
@@ -566,13 +566,16 @@ static NTSTATUS ntlmssp_server_negotiate(struct ntlmssp_state *ntlmssp_state,
 	/* This should be a 'netbios domain -> DNS domain' mapping */
 	dnsdomname = get_mydnsdomname(ntlmssp_state->mem_ctx);
 	if (!dnsdomname) {
-		return NT_STATUS_BAD_NETWORK_NAME;
+		dnsdomname = talloc_strdup(ntlmssp_state->mem_ctx, "");
+	}
+	if (!dnsdomname) {
+		return NT_STATUS_NO_MEMORY;
 	}
 	strlower_m(dnsdomname);
 
 	dnsname = get_mydnsfullname();
-	if (!dnsdomname) {
-		return NT_STATUS_INVALID_COMPUTER_NAME;
+	if (!dnsname) {
+		dnsname = "";
 	}
 
 	/* This creates the 'blob' of names that appears at the end of the packet */


-- 
Samba Shared Repository


More information about the samba-cvs mailing list