s3-param Make lp_dedicated_keytab_file() const

This disables % substitutions in the 'dedicated keytab file' parameter.

Andrew Bartlett

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 81ba17882c6ab06dba0bd0e51df0c27fe98a1042..0eae375bbc379daf6518c59b85dd14ce61e99fb2 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -1352,7 +1352,7 @@ bool lp_send_spnego_principal(void);
 bool lp_hostname_lookups(void);
 bool lp_change_notify(const struct share_params *p );
 bool lp_kernel_change_notify(const struct share_params *p );
-char * lp_dedicated_keytab_file(void);
+const char * lp_dedicated_keytab_file(void);
 int lp_kerberos_method(void);
 bool lp_defer_sharing_violations(void);
 bool lp_enable_privileges(void);

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index e14e705abcded10498cada1c0a716e3a5d5da832..e41e8f17ae9761a725b57091a0251f46791dd1c3 100644 (file)
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -5823,7 +5823,7 @@ FN_GLOBAL_BOOL(lp_send_spnego_principal, &Globals.send_spnego_principal)
 FN_GLOBAL_BOOL(lp_hostname_lookups, &Globals.bHostnameLookups)
 FN_LOCAL_PARM_BOOL(lp_change_notify, bChangeNotify)
 FN_LOCAL_PARM_BOOL(lp_kernel_change_notify, bKernelChangeNotify)
-FN_GLOBAL_STRING(lp_dedicated_keytab_file, &Globals.szDedicatedKeytabFile)
+FN_GLOBAL_CONST_STRING(lp_dedicated_keytab_file, &Globals.szDedicatedKeytabFile)
 FN_GLOBAL_INTEGER(lp_kerberos_method, &Globals.iKerberosMethod)
 FN_GLOBAL_BOOL(lp_defer_sharing_violations, &Globals.bDeferSharingViolations)
 FN_GLOBAL_BOOL(lp_enable_privileges, &Globals.bEnablePrivileges)