Changeset 745 for trunk/server/source4/smbd/service_task.c

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/smbd/service_task.c (modified) (3 diffs)

trunk/server/source4/smbd/service_task.c

@@ -24 +24 @@
 #include "lib/messaging/irpc.h"
 #include "param/param.h"
-#include "librpc/gen_ndr/ndr_irpc.h"
+#include "librpc/gen_ndr/ndr_irpc_c.h"
 
 /*
@@ -36 +36 @@
 
         if (fatal) {
+                struct dcerpc_binding_handle *irpc_handle;
                 struct samba_terminate r;
-                struct server_id *sid;
 
-                sid = irpc_servers_byname(task->msg_ctx, task, "samba");
-
-                r.in.reason = reason;
-                IRPC_CALL(task->msg_ctx, sid[0],
-                          irpc, SAMBA_TERMINATE,
-                          &r, NULL);
+                irpc_handle = irpc_binding_handle_by_name(task, task->msg_ctx,
+                                                          "samba", &ndr_table_irpc);
+                if (irpc_handle != NULL) {
+                        r.in.reason = reason;
+                        dcerpc_samba_terminate_r(irpc_handle, task, &r);
+                }
         }
 
@@ -80 +80 @@
 
         task->msg_ctx = messaging_init(task, 
-                                       lp_messaging_path(task, task->lp_ctx),
+                                       lpcfg_messaging_path(task, task->lp_ctx),
                                        task->server_id, 
-                                       lp_iconv_convenience(task->lp_ctx),
                                        task->event_ctx);
         if (!task->msg_ctx) {