sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

lib/param: Remove "ntptr providor" and hard-code in s4 spoolss server

Browse Source 
This stub codebase does not justify a merged parameter.

Andrew Bartlett

Pair-Programmed-With: Andrew Tridgell <tridge@samba.org>
This commit is contained in:
Andrew Bartlett 2012-07-23 12:01:41 +10:00
parent 01f25adb5a
commit 8b1a9f3ebd
3 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/param/loadparm.c
View File

@ -265,14 +265,6 @@ static struct parm_struct parm_table[] = {
.special = NULL, .special = NULL,
.enum_list = NULL .enum_list = NULL
}, },
{
.label = "ntptr providor",
.type = P_STRING,
.p_class = P_GLOBAL,
.offset = GLOBAL_VAR(ntptr_providor),
.special = NULL,
.enum_list = NULL
},
{ {
.label = "passdb backend", .label = "passdb backend",
.type = P_STRING, .type = P_STRING,
@ -3299,7 +3291,6 @@ struct loadparm_context *loadparm_init(TALLOC_CTX *mem_ctx)
lpcfg_do_global_parameter(lp_ctx, "dcerpc endpoint servers", "epmapper wkssvc rpcecho samr netlogon lsarpc spoolss drsuapi dssetup unixinfo browser eventlog6 backupkey dnsserver"); lpcfg_do_global_parameter(lp_ctx, "dcerpc endpoint servers", "epmapper wkssvc rpcecho samr netlogon lsarpc spoolss drsuapi dssetup unixinfo browser eventlog6 backupkey dnsserver");
lpcfg_do_global_parameter(lp_ctx, "server services", "s3fs rpc nbt wrepl ldap cldap kdc drepl winbind ntp_signd kcc dnsupdate"); lpcfg_do_global_parameter(lp_ctx, "server services", "s3fs rpc nbt wrepl ldap cldap kdc drepl winbind ntp_signd kcc dnsupdate");
lpcfg_do_global_parameter(lp_ctx, "ntptr providor", "simple_ldb");
/* the winbind method for domain controllers is for both RODC /* the winbind method for domain controllers is for both RODC
auth forwarding and for trusted domains */ auth forwarding and for trusted domains */
lpcfg_do_global_parameter(lp_ctx, "private dir", dyn_PRIVATE_DIR); lpcfg_do_global_parameter(lp_ctx, "private dir", dyn_PRIVATE_DIR);

1
lib/param/param_functions.c
View File

@ -394,7 +394,6 @@ FN_GLOBAL_STRING(log_nt_token_command, szLogNtTokenCommand)
FN_GLOBAL_STRING(mangling_method, szManglingMethod) FN_GLOBAL_STRING(mangling_method, szManglingMethod)
FN_GLOBAL_STRING(msg_command, szMsgCommand) FN_GLOBAL_STRING(msg_command, szMsgCommand)
FN_GLOBAL_STRING(nis_home_map_name, szNISHomeMapName) FN_GLOBAL_STRING(nis_home_map_name, szNISHomeMapName)
FN_GLOBAL_STRING(ntptr_providor, ntptr_providor)
FN_GLOBAL_STRING(os2_driver_map, szOs2DriverMap) FN_GLOBAL_STRING(os2_driver_map, szOs2DriverMap)
FN_GLOBAL_STRING(panic_action, szPanicAction) FN_GLOBAL_STRING(panic_action, szPanicAction)
FN_GLOBAL_STRING(passwd_chat, szPasswdChat) FN_GLOBAL_STRING(passwd_chat, szPasswdChat)

2
source4/rpc_server/spoolss/dcesrv_spoolss.c
View File

@ -220,7 +220,7 @@ static NTSTATUS dcerpc_spoolss_bind(struct dcesrv_call_state *dce_call, const st
struct ntptr_context *ntptr; struct ntptr_context *ntptr;
status = ntptr_init_context(dce_call->context, dce_call->conn->event_ctx, dce_call->conn->dce_ctx->lp_ctx, status = ntptr_init_context(dce_call->context, dce_call->conn->event_ctx, dce_call->conn->dce_ctx->lp_ctx,
lpcfg_ntptr_providor(dce_call->conn->dce_ctx->lp_ctx), &ntptr); "simple_ldb", &ntptr);
NT_STATUS_NOT_OK_RETURN(status); NT_STATUS_NOT_OK_RETURN(status);
dce_call->context->private_data = ntptr; dce_call->context->private_data = ntptr;