[SCM] Samba Shared Repository - branch master updated

[Matthias Dieter Wallnöfer]

The branch, master has been updated
       via  8b345ef... s4:netlogon RPC - Fix up the error handling
       via  1fb28b0... s4:netlogon RPC - Fix up a comment
      from  54991cd... Fixed incorrect indentation.

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


- Log -----------------------------------------------------------------
commit 8b345ef19e18ccfebf102750316976f512fda6ad
Author: Matthias Dieter Wallnöfer <mwallnoefer at yahoo.de>
Date:   Sun Nov 22 15:51:18 2009 +0100

    s4:netlogon RPC - Fix up the error handling

commit 1fb28b0204038e5cef63c2f1fbdc2b5424570e44
Author: Matthias Dieter Wallnöfer <mwallnoefer at yahoo.de>
Date:   Sun Nov 22 15:50:36 2009 +0100

    s4:netlogon RPC - Fix up a comment
    
    Now we have Windows 7 released so don't refer to a beta anymore.

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

Summary of changes:
 source4/rpc_server/netlogon/dcerpc_netlogon.c |   13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/rpc_server/netlogon/dcerpc_netlogon.c b/source4/rpc_server/netlogon/dcerpc_netlogon.c
index d59cb6f..8a833b0 100644
--- a/source4/rpc_server/netlogon/dcerpc_netlogon.c
+++ b/source4/rpc_server/netlogon/dcerpc_netlogon.c
@@ -1413,10 +1413,11 @@ static WERROR dcesrv_netr_DsRGetDCNameEx2(struct dcesrv_call_state *dce_call, TA
 		return WERR_DS_UNAVAILABLE;
 	}
 
-	/* 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 (r->in.domain_name != NULL && !lp_is_my_domain_or_realm(dce_call->conn->dce_ctx->lp_ctx, 
-								r->in.domain_name)) {
+	/* Windows 7 sends the domain name in the form the user typed, so we
+	 * have to cope  with both the short and long form here */
+	if (r->in.domain_name != NULL &&
+			!lp_is_my_domain_or_realm(dce_call->conn->dce_ctx->lp_ctx, 
+						  r->in.domain_name)) {
 		return WERR_NO_SUCH_DOMAIN;
 	}
 
@@ -1428,6 +1429,7 @@ static WERROR dcesrv_netr_DsRGetDCNameEx2(struct dcesrv_call_state *dce_call, TA
 	ret = gendb_search_dn(sam_ctx, mem_ctx,
 			      domain_dn, &res, attrs);
 	if (ret != 1) {
+		return WERR_GENERAL_FAILURE;
 	}
 
 	info = talloc(mem_ctx, struct netr_DsRGetDCNameInfo);
@@ -1602,9 +1604,6 @@ static WERROR dcesrv_netr_DsrEnumerateDomainTrusts(struct dcesrv_call_state *dce
 
 	ret = gendb_search_dn(sam_ctx, mem_ctx, NULL,
 			      &dom_res, dom_attrs);
-	if (ret == -1) {
-		return WERR_GENERAL_FAILURE;		
-	}
 	if (ret != 1) {
 		return WERR_GENERAL_FAILURE;
 	}


-- 
Samba Shared Repository