diff options
author | Andrew Bartlett <abartlet@samba.org> | 2011-06-01 12:15:48 +1000 |
---|---|---|
committer | Andrew Bartlett <abartlet@samba.org> | 2011-06-01 04:19:06 +0200 |
commit | b9d61ef55a45bc58d7e0c6dae0969cf938974020 (patch) | |
tree | 2256aa371abd56e99d3fd03fbd269570aae23d66 /source3 | |
parent | edc3041093b17ae6e18c5b7a64a94b5bfb3c3998 (diff) | |
download | samba-b9d61ef55a45bc58d7e0c6dae0969cf938974020.tar.gz samba-b9d61ef55a45bc58d7e0c6dae0969cf938974020.tar.bz2 samba-b9d61ef55a45bc58d7e0c6dae0969cf938974020.zip |
s3-param Make lp_dedicated_keytab_file() const
This disables % substitutions in the 'dedicated keytab file' parameter.
Andrew Bartlett
Diffstat (limited to 'source3')
-rw-r--r-- | source3/include/proto.h | 2 | ||||
-rw-r--r-- | source3/param/loadparm.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h index 81ba17882c..0eae375bbc 100644 --- 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 e14e705abc..e41e8f17ae 100644 --- 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) |