diff options
| -rwxr-xr-x | selftest/target/Samba3.pm | 1 | ||||
| -rw-r--r-- | source3/rpc_server/rpc_service_setup.c | 9 |
2 files changed, 9 insertions, 1 deletions
diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm index c93a0f1f10..7e4e601cfe 100755 --- a/selftest/target/Samba3.pm +++ b/selftest/target/Samba3.pm @@ -194,6 +194,7 @@ sub setup_s3dc($$) rpc_server:lsarpc = external rpc_server:samr = external rpc_server:netlogon = external + rpc_server:register_embedded_np = yes rpc_daemon:epmd = fork rpc_daemon:spoolssd = fork diff --git a/source3/rpc_server/rpc_service_setup.c b/source3/rpc_server/rpc_service_setup.c index bde0d8da89..9fc12f2e31 100644 --- a/source3/rpc_server/rpc_service_setup.c +++ b/source3/rpc_server/rpc_service_setup.c @@ -63,7 +63,14 @@ static bool rpc_setup_embedded(struct tevent_context *ev_ctx, enum rpc_service_mode_e epm_mode = rpc_epmapper_mode(); NTSTATUS status; - if (epm_mode != RPC_SERVICE_MODE_DISABLED) { + /* Registration of ncacn_np services is problematic. The + * ev_ctx passed in here is passed down to all children of the + * smbd process, and if the end point mapper ever goes away, + * they will all attempt to re-register. But we want to test + * the code for now, so it is enabled in on environment in + * make test */ + if (epm_mode != RPC_SERVICE_MODE_DISABLED && + (lp_parm_bool(-1, "rpc_server", "register_embedded_np", false))) { status = dcerpc_binding_vector_new(talloc_tos(), &v); if (!NT_STATUS_IS_OK(status)) { return false; |