[SCM] Samba Shared Repository - branch master updated

[Stefan Metzmacher]

The branch, master has been updated
       via  76232a4 s4:rpc_server/netlogon: don't use dcerpc_binding_handle_call_send/recv() directly
       via  47b3d88 netlogon.idl: add missing flags to DSGETDC_VALID_FLAGS
      from  0ea3877 s4-gensec Always honour the set server principal

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


- Log -----------------------------------------------------------------
commit 76232a40d844dc37720e07ee0f2131526a1a6942
Author: Stefan Metzmacher <metze at samba.org>
Date:   Fri Oct 1 09:53:05 2010 +0200

    s4:rpc_server/netlogon: don't use dcerpc_binding_handle_call_send/recv() directly
    
    metze
    
    Autobuild-User: Stefan Metzmacher <metze at samba.org>
    Autobuild-Date: Sat Oct  2 03:11:38 UTC 2010 on sn-devel-104

commit 47b3d88a7da37c45d9d0d0be5f164fa0a8c56328
Author: Stefan Metzmacher <metze at samba.org>
Date:   Thu Sep 30 00:26:33 2010 +0200

    netlogon.idl: add missing flags to DSGETDC_VALID_FLAGS
    
    metze

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

Summary of changes:
 librpc/idl/netlogon.idl                       |    3 +++
 source4/rpc_server/netlogon/dcerpc_netlogon.c |   21 +++++++++------------
 2 files changed, 12 insertions(+), 12 deletions(-)


Changeset truncated at 500 lines:

diff --git a/librpc/idl/netlogon.idl b/librpc/idl/netlogon.idl
index 1685cf9..b3612ab 100644
--- a/librpc/idl/netlogon.idl
+++ b/librpc/idl/netlogon.idl
@@ -1105,6 +1105,9 @@ interface netlogon
 					 DS_ONLY_LDAP_NEEDED |
 					 DS_IS_FLAT_NAME |
 					 DS_IS_DNS_NAME |
+					 DS_TRY_NEXTCLOSEST_SITE |
+					 DS_DIRECTORY_SERVICE_6_REQUIRED |
+					 DS_WEB_SERVICE_REQUIRED |
 					 DS_RETURN_FLAT_NAME |
 					 DS_RETURN_DNS_NAME);
 
diff --git a/source4/rpc_server/netlogon/dcerpc_netlogon.c b/source4/rpc_server/netlogon/dcerpc_netlogon.c
index dee4dc4..6d48521 100644
--- a/source4/rpc_server/netlogon/dcerpc_netlogon.c
+++ b/source4/rpc_server/netlogon/dcerpc_netlogon.c
@@ -2279,15 +2279,15 @@ struct netr_dnsupdate_RODC_state {
 /*
   called when the forwarded RODC dns update request is finished
  */
-static void netr_dnsupdate_RODC_callback(struct tevent_req *req)
+static void netr_dnsupdate_RODC_callback(struct tevent_req *subreq)
 {
 	struct netr_dnsupdate_RODC_state *st =
-		tevent_req_callback_data(req,
+		tevent_req_callback_data(subreq,
 					 struct netr_dnsupdate_RODC_state);
 	NTSTATUS status;
 
-	status = dcerpc_binding_handle_call_recv(req);
-	talloc_free(req);
+	status = dcerpc_dnsupdate_RODC_r_recv(subreq, st->dce_call);
+	TALLOC_FREE(subreq);
 	if (!NT_STATUS_IS_OK(status)) {
 		DEBUG(0,(__location__ ": IRPC callback failed %s\n", nt_errstr(status)));
 		st->dce_call->fault_code = DCERPC_FAULT_CANT_PERFORM;
@@ -2312,7 +2312,7 @@ static NTSTATUS dcesrv_netr_DsrUpdateReadOnlyServerDnsRecords(struct dcesrv_call
 	NTSTATUS nt_status;
 	struct dcerpc_binding_handle *binding_handle;
 	struct netr_dnsupdate_RODC_state *st;
-	struct tevent_req *req;
+	struct tevent_req *subreq;
 
 	nt_status = dcesrv_netr_creds_server_step_check(dce_call,
 							mem_ctx,
@@ -2349,17 +2349,14 @@ static NTSTATUS dcesrv_netr_DsrUpdateReadOnlyServerDnsRecords(struct dcesrv_call
 	}
 
 	/* forward the call */
-	req = dcerpc_binding_handle_call_send(st, dce_call->event_ctx,
-					      binding_handle,
-					      NULL, &ndr_table_irpc,
-					      NDR_DNSUPDATE_RODC,
-					      st, st->r2);
-	NT_STATUS_HAVE_NO_MEMORY(req);
+	subreq = dcerpc_dnsupdate_RODC_r_send(st, dce_call->event_ctx,
+					      binding_handle, st->r2);
+	NT_STATUS_HAVE_NO_MEMORY(subreq);
 
 	dce_call->state_flags |= DCESRV_CALL_STATE_FLAG_ASYNC;
 
 	/* setup the callback */
-	tevent_req_set_callback(req, netr_dnsupdate_RODC_callback, st);
+	tevent_req_set_callback(subreq, netr_dnsupdate_RODC_callback, st);
 
 	return NT_STATUS_OK;
 }


-- 
Samba Shared Repository