sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-10-25 19:33:18 +03:00
Code Activity

r25430: Add the loadparm context to all parametric options.

Browse Source
This commit is contained in:
Jelmer Vernooij
2007-09-29 18:00:19 +00:00
committed by Gerald (Jerry) Carter
parent b945aaa9da
commit fd697d77c9
70 changed files with 237 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/rpc_server/common/server_info.c
View File

@@ -36,7 +36,7 @@ _PUBLIC_ enum srvsvc_PlatformId dcesrv_common_get_platform_id(TALLOC_CTX *mem_ct
{
enum srvsvc_PlatformId id;
id = lp_parm_int(NULL, "server_info", "platform_id", PLATFORM_ID_NT);
id = lp_parm_int(global_loadparm, NULL, "server_info", "platform_id", PLATFORM_ID_NT);
return id;
}
@@ -66,19 +66,19 @@ const char *dcesrv_common_get_domain_name(TALLOC_CTX *mem_ctx, struct dcesrv_con
/* This hardcoded value should go into a ldb database! */
_PUBLIC_ uint32_t dcesrv_common_get_version_major(TALLOC_CTX *mem_ctx, struct dcesrv_context *dce_ctx)
{
return lp_parm_int(NULL, "server_info", "version_major", 5);
return lp_parm_int(global_loadparm, NULL, "server_info", "version_major", 5);
}
/* This hardcoded value should go into a ldb database! */
_PUBLIC_ uint32_t dcesrv_common_get_version_minor(TALLOC_CTX *mem_ctx, struct dcesrv_context *dce_ctx)
{
return lp_parm_int(NULL, "server_info", "version_minor", 2);
return lp_parm_int(global_loadparm, NULL, "server_info", "version_minor", 2);
}
/* This hardcoded value should go into a ldb database! */
_PUBLIC_ uint32_t dcesrv_common_get_version_build(TALLOC_CTX *mem_ctx, struct dcesrv_context *dce_ctx)
{
return lp_parm_int(NULL, "server_info", "version_build", 3790);
return lp_parm_int(global_loadparm, NULL, "server_info", "version_build", 3790);
}
/* This hardcoded value should go into a ldb database! */

12
source/rpc_server/remote/dcesrv_remote.c
View File

@@ -40,12 +40,12 @@ static NTSTATUS remote_op_bind(struct dcesrv_call_state *dce_call, const struct
NTSTATUS status;
const struct ndr_interface_table *table;
struct dcesrv_remote_private *private;
const char *binding = lp_parm_string(NULL, "dcerpc_remote", "binding");
const char *binding = lp_parm_string(global_loadparm, NULL, "dcerpc_remote", "binding");
const char *user, *pass, *domain;
struct cli_credentials *credentials;
BOOL machine_account;
machine_account = lp_parm_bool(NULL, "dcerpc_remote", "use_machine_account", false);
machine_account = lp_parm_bool(global_loadparm, NULL, "dcerpc_remote", "use_machine_account", false);
private = talloc(dce_call->conn, struct dcesrv_remote_private);
if (!private) {
@@ -60,9 +60,9 @@ static NTSTATUS remote_op_bind(struct dcesrv_call_state *dce_call, const struct
return NT_STATUS_INVALID_PARAMETER;
}
user = lp_parm_string(NULL, "dcerpc_remote", "user");
pass = lp_parm_string(NULL, "dcerpc_remote", "password");
domain = lp_parm_string(NULL, "dceprc_remote", "domain");
user = lp_parm_string(global_loadparm, NULL, "dcerpc_remote", "user");
pass = lp_parm_string(global_loadparm, NULL, "dcerpc_remote", "password");
domain = lp_parm_string(global_loadparm, NULL, "dceprc_remote", "domain");
table = ndr_table_by_uuid(&iface->syntax_id.uuid); /* FIXME: What about if_version ? */
if (!table) {
@@ -224,7 +224,7 @@ static NTSTATUS remote_register_one_iface(struct dcesrv_context *dce_ctx, const
static NTSTATUS remote_op_init_server(struct dcesrv_context *dce_ctx, const struct dcesrv_endpoint_server *ep_server)
{
int i;
const char **ifaces = str_list_make(dce_ctx, lp_parm_string(NULL,"dcerpc_remote","interfaces"),NULL);
const char **ifaces = str_list_make(dce_ctx, lp_parm_string(global_loadparm, NULL, "dcerpc_remote", "interfaces"),NULL);
if (!ifaces) {
DEBUG(3,("remote_op_init_server: no interfaces configured\n"));