s3-rpc_server: Only setup tcpip ports if epmapper is enabled.

Autobuild-User: Andreas Schneider <asn@cryptomilk.org>
Autobuild-Date: Mon Aug  1 12:31:59 CEST 2011 on sn-devel-104

diff --git a/source3/rpc_server/rpc_service_setup.c b/source3/rpc_server/rpc_service_setup.c
index 86a5a7a378fd6946f7019911a2f8765de69e09c1..f6cc97d7267bf9616b5f858faa241bd2e8332c27 100644 (file)
--- a/source3/rpc_server/rpc_service_setup.c
+++ b/source3/rpc_server/rpc_service_setup.c
@@ -916,6 +916,7 @@ static bool rpc_setup_initshutdown(struct tevent_context *ev_ctx,
 bool dcesrv_ep_setup(struct tevent_context *ev_ctx,
                     struct messaging_context *msg_ctx)
 {
+       enum rpc_service_mode_e epm_mode = rpc_epmapper_mode();
        struct dcerpc_binding_vector *v;
        const char *rpcsrv_type;
        TALLOC_CTX *tmp_ctx;
@@ -944,8 +945,9 @@ bool dcesrv_ep_setup(struct tevent_context *ev_ctx,
                                           "tcpip",
                                           "no");
 
-       if (strcasecmp_m(rpcsrv_type, "yes") == 0 ||
-           strcasecmp_m(rpcsrv_type, "true") == 0) {
+       if ((strcasecmp_m(rpcsrv_type, "yes") == 0 ||
+            strcasecmp_m(rpcsrv_type, "true") == 0)
+           && epm_mode != RPC_SERVICE_MODE_DISABLED) {
                status = rpc_setup_tcpip_sockets(ev_ctx,
                                                 msg_ctx,
                                                 &ndr_table_winreg,