Changeset 745 for trunk/server/source4/rpc_server/common

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source4/rpc_server/common/common.h (modified) (2 diffs)
• source4/rpc_server/common/forward.c (modified) (5 diffs)
• source4/rpc_server/common/reply.c (copied) (copied from vendor/current/source4/rpc_server/common/reply.c )
• source4/rpc_server/common/server_info.c (modified) (7 diffs)

trunk/server/source4/rpc_server/common/common.h

@@ -25 +25 @@
 
 struct share_config;
+struct dcesrv_connection;
 struct dcesrv_context;
 struct dcesrv_context;
+struct dcesrv_call_state;
+struct ndr_interface_table;
+struct ncacn_packet;
 
 struct dcerpc_server_info { 
@@ -35 +39 @@
 };
 
-struct ndr_interface_table;
-struct dcesrv_call_state;
 #include "rpc_server/common/proto.h"
 

trunk/server/source4/rpc_server/common/forward.c

@@ -21 +21 @@
 
 #include "includes.h"
+#include <tevent.h>
 #include "rpc_server/dcerpc_server.h"
+#include "librpc/gen_ndr/dcerpc.h"
+#include "rpc_server/common/common.h"
 #include "messaging/irpc.h"
+#include "auth/auth.h"
+
 
 struct dcesrv_forward_state {
@@ -32 +37 @@
   called when the forwarded rpc request is finished
  */
-static void dcesrv_irpc_forward_callback(struct irpc_request *ireq)
+static void dcesrv_irpc_forward_callback(struct tevent_req *subreq)
 {
-        struct dcesrv_forward_state *st = talloc_get_type(ireq->async.private_data, 
-                                                          struct dcesrv_forward_state);
+        struct dcesrv_forward_state *st =
+                tevent_req_callback_data(subreq,
+                struct dcesrv_forward_state);
         const char *opname = st->opname;
         NTSTATUS status;
-        if (!NT_STATUS_IS_OK(ireq->status)) {
+
+        status = dcerpc_binding_handle_call_recv(subreq);
+        TALLOC_FREE(subreq);
+        if (!NT_STATUS_IS_OK(status)) {
                 DEBUG(0,("IRPC callback failed for %s - %s\n",
-                         opname, nt_errstr(ireq->status)));
+                         opname, nt_errstr(status)));
                 st->dce_call->fault_code = DCERPC_FAULT_CANT_PERFORM;
         }
-        talloc_free(ireq);
         status = dcesrv_reply(st->dce_call);
         if (!NT_STATUS_IS_OK(status)) {
@@ -53 +61 @@
 
 
-/*
-  forward a RPC call using IRPC to another task
+/**
+ * Forward a RPC call using IRPC to another task
  */
 void dcesrv_irpc_forward_rpc_call(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx,
                                   void *r, uint32_t callid,
                                   const struct ndr_interface_table *ndr_table,
-                                  const char *dest_task, const char *opname)
+                                  const char *dest_task, const char *opname,
+                                  uint32_t timeout)
 {
-        struct server_id *sid;
-        struct irpc_request *ireq;
         struct dcesrv_forward_state *st;
+        struct dcerpc_binding_handle *binding_handle;
+        struct tevent_req *subreq;
+        struct security_token *token;
 
         st = talloc(mem_ctx, struct dcesrv_forward_state);
@@ -83 +93 @@
         }
 
-        /* find the server task */
-        sid = irpc_servers_byname(dce_call->msg_ctx, mem_ctx, dest_task);
-        if (sid == NULL || sid[0].id == 0) {
-                DEBUG(0,("%s: Unable to find %s task\n", dest_task, opname));
+        binding_handle = irpc_binding_handle_by_name(st, dce_call->msg_ctx,
+                                                     dest_task, ndr_table);
+        if (binding_handle == NULL) {
+                DEBUG(0,("%s: Failed to forward request to %s task\n",
+                         opname, dest_task));
                 dce_call->fault_code = DCERPC_FAULT_CANT_PERFORM;
                 return;
         }
 
+        /* reset timeout for the handle */
+        dcerpc_binding_handle_set_timeout(binding_handle, timeout);
+
+        /* add security token to the handle*/
+        token = dce_call->conn->auth_state.session_info->security_token;
+        irpc_binding_handle_add_security_token(binding_handle, token);
+
         /* forward the call */
-        ireq = irpc_call_send(dce_call->msg_ctx, sid[0], ndr_table, callid, r, mem_ctx);
-        if (ireq == NULL) {
+        subreq = dcerpc_binding_handle_call_send(st, dce_call->event_ctx,
+                                                 binding_handle,
+                                                 NULL, ndr_table,
+                                                 callid,
+                                                 dce_call, r);
+        if (subreq == NULL) {
                 DEBUG(0,("%s: Failed to forward request to %s task\n", 
                          opname, dest_task));
@@ -104 +126 @@
 
         /* setup the callback */
-        ireq->async.fn = dcesrv_irpc_forward_callback;
-        ireq->async.private_data = st;
+        tevent_req_set_callback(subreq, dcesrv_irpc_forward_callback, st);
 }

trunk/server/source4/rpc_server/common/server_info.c

@@ -21 +21 @@
 
 #include "includes.h"
-#include "librpc/gen_ndr/ndr_srvsvc.h"
+#include "librpc/gen_ndr/srvsvc.h"
 #include "rpc_server/dcerpc_server.h"
 #include "dsdb/samdb/samdb.h"
 #include "auth/auth.h"
 #include "param/param.h"
-#include "rpc_server/common/common.h"
 
 /* 
@@ -37 +36 @@
         enum srvsvc_PlatformId id;
 
-        id = lp_parm_int(dce_ctx->lp_ctx, NULL, "server_info", "platform_id", PLATFORM_ID_NT);
+        id = lpcfg_parm_int(dce_ctx->lp_ctx, NULL, "server_info", "platform_id", PLATFORM_ID_NT);
 
         return id;
@@ -48 +47 @@
         /* if there's no string return our NETBIOS name */
         if (!p) {
-                return talloc_strdup(mem_ctx, lp_netbios_name(dce_ctx->lp_ctx));
+                return talloc_strdup(mem_ctx, lpcfg_netbios_name(dce_ctx->lp_ctx));
         }
 
@@ -68 +67 @@
         default_server_announce |= SV_TYPE_SERVER_UNIX;
 
-        switch (lp_announce_as(dce_ctx->lp_ctx)) {
+        switch (lpcfg_announce_as(dce_ctx->lp_ctx)) {
                 case ANNOUNCE_AS_NT_SERVER:
                         default_server_announce |= SV_TYPE_SERVER_NT;
@@ -85 +84 @@
         }
 
-        switch (lp_server_role(dce_ctx->lp_ctx)) {
+        switch (lpcfg_server_role(dce_ctx->lp_ctx)) {
                 case ROLE_DOMAIN_MEMBER:
                         default_server_announce |= SV_TYPE_DOMAIN_MEMBER;
@@ -97 +96 @@
                         }
                         /* open main ldb */
-                        samctx = samdb_connect(tmp_ctx, event_ctx, dce_ctx->lp_ctx, anonymous_session(tmp_ctx, event_ctx, dce_ctx->lp_ctx));
+                        samctx = samdb_connect(tmp_ctx, event_ctx, dce_ctx->lp_ctx, anonymous_session(tmp_ctx, dce_ctx->lp_ctx), 0);
                         if (samctx == NULL) {
                                 DEBUG(2,("Unable to open samdb in determining server announce flags\n"));
@@ -117 +116 @@
                         break;
         }
-        if (lp_time_server(dce_ctx->lp_ctx))
+        if (lpcfg_time_server(dce_ctx->lp_ctx))
                 default_server_announce |= SV_TYPE_TIME_SOURCE;
 
-        if (lp_host_msdfs(dce_ctx->lp_ctx))
+        if (lpcfg_host_msdfs(dce_ctx->lp_ctx))
                 default_server_announce |= SV_TYPE_DFS_SERVER;