[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1-gb679f6b

Stefan Metzmacher metze at samba.org
Thu Feb 26 08:11:16 GMT 2009


The branch, master has been updated
       via  b679f6b25673969800f31cf0bd0f57799bb0598c (commit)
       via  c3632e4efc506a401a9d75c4d75b14a1a220caa2 (commit)
       via  76a0050e239b1fb9e2135f2e6cea80ed780a0ee0 (commit)
      from  59a28a22ab26bb7f2c12f9bccda9c7f585d992a7 (commit)

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


- Log -----------------------------------------------------------------
commit b679f6b25673969800f31cf0bd0f57799bb0598c
Author: Stefan Metzmacher <metze at samba.org>
Date:   Thu Feb 26 09:10:23 2009 +0100

    s4:VERSION: mark as 4.0.0-alpha8 gitsnapshot
    
    metze

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

Summary of changes:
 source4/VERSION                               |    2 +-
 source4/rpc_server/netlogon/dcerpc_netlogon.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/VERSION b/source4/VERSION
index e7d05f6..58f8cc1 100644
--- a/source4/VERSION
+++ b/source4/VERSION
@@ -57,7 +57,7 @@ SAMBA_VERSION_TP_RELEASE=
 # e.g. SAMBA_VERSION_ALPHA_RELEASE=1                   #
 #  ->  "4.0.0alpha1"                                   #
 ########################################################
-SAMBA_VERSION_ALPHA_RELEASE=7
+SAMBA_VERSION_ALPHA_RELEASE=8
 
 ########################################################
 # For 'pre' releases the version will be               #
diff --git a/source4/rpc_server/netlogon/dcerpc_netlogon.c b/source4/rpc_server/netlogon/dcerpc_netlogon.c
index f1c063e..2efddc7 100644
--- a/source4/rpc_server/netlogon/dcerpc_netlogon.c
+++ b/source4/rpc_server/netlogon/dcerpc_netlogon.c
@@ -1220,7 +1220,7 @@ static WERROR dcesrv_netr_DsRGetDCNameEx2(struct dcesrv_call_state *dce_call, TA
 
 	/* Win7-beta will send the domain name in the form the user typed, so we have to cope
 	   with both the short and long form here */
-	if (strcasecmp(r->in.domain_name, lp_workgroup(dce_call->conn->dce_ctx->lp_ctx)) == 0) {
+	if (r->in.domain_name == NULL || strcasecmp(r->in.domain_name, lp_workgroup(dce_call->conn->dce_ctx->lp_ctx)) == 0) {
 		r->in.domain_name = lp_realm(dce_call->conn->dce_ctx->lp_ctx);
 	}
 


-- 
Samba Shared Repository


More information about the samba-cvs mailing list