diff options
| author | Simo Sorce <ssorce@redhat.com> | 2010-05-20 08:39:10 -0400 |
|---|---|---|
| committer | Andreas Schneider <asn@samba.org> | 2010-09-15 12:53:40 +0200 |
| commit | 94d86a22a1ecfb74ccaa4ce441c33186544a69c8 (patch) | |
| tree | 782ae97245800f25664f485e3d16f844a3e9a8c8 | |
| parent | 65bd8f881db3315c1369835fe6cfc2f27a04ae15 (diff) | |
| download | samba-94d86a22a1ecfb74ccaa4ce441c33186544a69c8.tar.gz samba-94d86a22a1ecfb74ccaa4ce441c33186544a69c8.tar.xz samba-94d86a22a1ecfb74ccaa4ce441c33186544a69c8.zip | |
s3-misc: Introduce lp_ncalrpc_dir() in S3, like we have in S4.
| -rw-r--r-- | source3/include/proto.h | 1 | ||||
| -rw-r--r-- | source3/param/loadparm.c | 14 |
2 files changed, 15 insertions, 0 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h index e1751e803fc..b19f985a855 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -3667,6 +3667,7 @@ int lp_min_receive_file_size(void); char* lp_perfcount_module(void); void lp_set_passdb_backend(const char *backend); void widelinks_warning(int snum); +char *lp_ncalrpc_dir(void); /* The following definitions come from param/loadparm_server_role.c */ diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index bb6e1324fe7..4ae699ac2a4 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -376,6 +376,7 @@ struct global { int ismb2_max_read; int ismb2_max_write; int ismb2_max_trans; + char *ncalrpc_dir; }; static struct global Globals; @@ -4722,6 +4723,15 @@ static struct parm_struct parm_table[] = { .enum_list = NULL, .flags = FLAG_ADVANCED, }, + { + .label = "ncalrpc dir", + .type = P_STRING, + .p_class = P_GLOBAL, + .ptr = &Globals.ncalrpc_dir, + .special = NULL, + .enum_list = NULL, + .flags = FLAG_ADVANCED, + }, {NULL, P_BOOL, P_NONE, NULL, NULL, NULL, 0} }; @@ -5365,6 +5375,8 @@ static void init_globals(bool reinit_globals) Globals.ismb2_max_write = 1024*1024; Globals.ismb2_max_trans = 1024*1024; + string_set(&Globals.ncalrpc_dir, get_dyn_NCALRPCDIR()); + /* Now put back the settings that were set with lp_set_cmdline() */ apply_lp_set_cmdline(); } @@ -5895,6 +5907,8 @@ FN_GLOBAL_INTEGER(lp_client_signing, &Globals.client_signing) FN_GLOBAL_INTEGER(lp_server_signing, &Globals.server_signing) FN_GLOBAL_INTEGER(lp_client_ldap_sasl_wrapping, &Globals.client_ldap_sasl_wrapping) +FN_GLOBAL_STRING(lp_ncalrpc_dir, &Globals.ncalrpc_dir) + /* local prototypes */ static int map_parameter_canonical(const char *pszParmName, bool *inverse); |