s3-misc: Introduce lp_ncalrpc_dir() in S3, like we have in S4.

diff --git a/source3/include/proto.h b/source3/include/proto.h
index e1751e803fc009eacf2758cf77b04230a7de57d7..b19f985a8558edb4af6870bfa9ed6d6803f090ba 100644 (file)
--- 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 bb6e1324fe70720faa7354d08e67d7c368ae378f..4ae699ac2a47f6612ef982a01a4fd24ca2d8a416 100644 (file)
--- 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);