sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-26 01:49:31 +03:00
Code Activity

s3-smbd: Disable the endpoint mapper by default.

Browse Source
This commit is contained in:
Andreas Schneider
2011-01-20 15:37:46 +01:00
committed by Andreas Schneider
parent e3bdfd2d46
commit d0d5d59943
3 changed files with 32 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
selftest/target/Samba3.pm
View File

@ -556,6 +556,8 @@ sub provision($$$$$$)
queue resume command = $bindir_abs/vlp tdbfile=$lockdir/vlp.tdb queueresume %p
lpq cache time = 0
rpc_server:epmapper = embedded
# Begin extra options
$extra_options
# End extra options

30
source3/rpc_server/srv_rpc_register.c
View File

@ -48,6 +48,15 @@ static NTSTATUS _rpc_ep_register(const struct ndr_interface_table *iface,
{
struct dcerpc_binding_vector *v = NULL;
NTSTATUS status;
const char *rpcsrv_type;
/* start endpoint mapper only if enabled */
rpcsrv_type = lp_parm_const_string(GLOBAL_SECTION_SNUM,
"rpc_server", "epmapper",
"none");
if (StrCaseCmp(rpcsrv_type, "none") == 0) {
return NT_STATUS_OK;
}
status = dcerpc_binding_vector_create(talloc_tos(),
iface,
@ -71,6 +80,15 @@ static NTSTATUS _rpc_ep_unregister(const struct ndr_interface_table *iface)
{
struct dcerpc_binding_vector *v = NULL;
NTSTATUS status;
const char *rpcsrv_type;
/* start endpoint mapper only if enabled */
rpcsrv_type = lp_parm_const_string(GLOBAL_SECTION_SNUM,
"rpc_server", "epmapper",
"none");
if (StrCaseCmp(rpcsrv_type, "none") == 0) {
return NT_STATUS_OK;
}
status = dcerpc_binding_vector_create(talloc_tos(),
iface,
@ -265,8 +283,16 @@ bool srv_rpc_register(struct messaging_context *msg_ctx) {
struct rpc_srv_callbacks dssetup_cb;
struct rpc_srv_callbacks wkssvc_cb;
if (!NT_STATUS_IS_OK(rpc_epmapper_init(NULL))) {
return false;
const char *rpcsrv_type;
/* start endpoint mapper only if enabled */
rpcsrv_type = lp_parm_const_string(GLOBAL_SECTION_SNUM,
"rpc_server", "epmapper",
"none");
if (StrCaseCmp(rpcsrv_type, "embedded") == 0) {
if (!NT_STATUS_IS_OK(rpc_epmapper_init(NULL))) {
return false;
}
}
winreg_cb.init = winreg_init_cb;

2
source3/script/tests/selftest.sh
View File

@ -343,6 +343,8 @@ cat >$SERVERCONFFILE<<EOF
queue resume command = $BINDIR/vlp tdbfile=$LOCKDIR/vlp.tdb queueresume %p
lpq cache time = 0
rpc_server:epmapper = embedded
#Include user defined custom parameters if set
$INCLUDE_CUSTOM_CONF