lib/util: consolidate module loading into common code

[samba.git] / source4 / rpc_server / dcerpc_server.c

diff --git a/source4/rpc_server/dcerpc_server.c b/source4/rpc_server/dcerpc_server.c
index 01ce9891254ad20b6436da2cbb5336e293d5f3e0..a16e6ac9d5f2e4894239ac44043f4d748d4f5d63 100644 (file)
--- a/source4/rpc_server/dcerpc_server.c
+++ b/source4/rpc_server/dcerpc_server.c
@@ -39,6 +39,7 @@
 #include "smbd/process_model.h"
 #include "lib/messaging/irpc.h"
 #include "librpc/rpc/rpc_common.h"
+#include "lib/util/samba_modules.h"
 
 /* this is only used when the client asks for an unknown interface */
 #define DUMMY_ASSOC_GROUP 0x0FFFFFFF
@@ -1235,7 +1236,7 @@ void dcerpc_server_init(struct loadparm_context *lp_ctx)
        }
        initialized = true;
 
-       shared_init = load_samba_modules(NULL, lp_ctx, "dcerpc_server");
+       shared_init = load_samba_modules(NULL, "dcerpc_server");
 
        run_init_functions(static_init);
        run_init_functions(shared_init);
@@ -1353,7 +1354,7 @@ static void dcesrv_sock_reply_done(struct tevent_req *subreq)
        ret = tstream_writev_queue_recv(subreq, &sys_errno);
        TALLOC_FREE(subreq);
        if (ret == -1) {
-               status = map_nt_error_from_unix(sys_errno);
+               status = map_nt_error_from_unix_common(sys_errno);
                dcesrv_terminate_connection(substate->dce_conn, nt_errstr(status));
                return;
        }
@@ -1436,7 +1437,7 @@ static void dcesrv_sock_accept(struct stream_connection *srv_conn)
                                                  socket_get_fd(srv_conn->socket),
                                                  &dcesrv_conn->stream);
                if (ret == -1) {
-                       status = map_nt_error_from_unix(errno);
+                       status = map_nt_error_from_unix_common(errno);
                        DEBUG(0, ("dcesrv_sock_accept: "
                                  "failed to setup tstream: %s\n",
                                  nt_errstr(status)));
@@ -1678,7 +1679,7 @@ static NTSTATUS dcesrv_add_ep_tcp(struct dcesrv_context *dce_ctx,
                int i;
                struct interface *ifaces;
 
-               load_interface_list(dce_ctx, lpcfg_interfaces(lp_ctx), &ifaces);
+               load_interface_list(dce_ctx, lp_ctx, &ifaces);
 
                num_interfaces = iface_list_count(ifaces);
                for(i = 0; i < num_interfaces; i++) {