From 8b1a9f3ebd48757e66f6aefc5840986bec223de9 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Mon, 23 Jul 2012 12:01:41 +1000 Subject: lib/param: Remove "ntptr providor" and hard-code in s4 spoolss server This stub codebase does not justify a merged parameter. Andrew Bartlett Pair-Programmed-With: Andrew Tridgell --- lib/param/loadparm.c | 9 --------- lib/param/param_functions.c | 1 - source4/rpc_server/spoolss/dcesrv_spoolss.c | 2 +- 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c index 323b795d76..5559ef621f 100644 --- a/lib/param/loadparm.c +++ b/lib/param/loadparm.c @@ -265,14 +265,6 @@ static struct parm_struct parm_table[] = { .special = 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", .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, "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 auth forwarding and for trusted domains */ lpcfg_do_global_parameter(lp_ctx, "private dir", dyn_PRIVATE_DIR); diff --git a/lib/param/param_functions.c b/lib/param/param_functions.c index 9ebc38119f..4e68d6b5ee 100644 --- a/lib/param/param_functions.c +++ b/lib/param/param_functions.c @@ -394,7 +394,6 @@ FN_GLOBAL_STRING(log_nt_token_command, szLogNtTokenCommand) FN_GLOBAL_STRING(mangling_method, szManglingMethod) FN_GLOBAL_STRING(msg_command, szMsgCommand) 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(panic_action, szPanicAction) FN_GLOBAL_STRING(passwd_chat, szPasswdChat) diff --git a/source4/rpc_server/spoolss/dcesrv_spoolss.c b/source4/rpc_server/spoolss/dcesrv_spoolss.c index 4c22d358df..7227baaeb4 100644 --- a/source4/rpc_server/spoolss/dcesrv_spoolss.c +++ b/source4/rpc_server/spoolss/dcesrv_spoolss.c @@ -220,7 +220,7 @@ static NTSTATUS dcerpc_spoolss_bind(struct dcesrv_call_state *dce_call, const st struct ntptr_context *ntptr; 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); dce_call->context->private_data = ntptr; -- cgit