diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-06-01 12:18:00 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-06-01 05:30:53 +0200 |
| commit | 5a8218b147ac62c065903591a15360a906da9bec (patch) | |
| tree | 4909b0a67512326984e6bcb28ede853dc2ca6618 | |
| parent | b9d61ef55a45bc58d7e0c6dae0969cf938974020 (diff) | |
| download | samba-5a8218b147ac62c065903591a15360a906da9bec.tar.gz samba-5a8218b147ac62c065903591a15360a906da9bec.tar.bz2 samba-5a8218b147ac62c065903591a15360a906da9bec.zip | |
s3-param Make lp_ncalrpc_dir() const
This disables % substitutions in the 'ncalrpc dir' parameter. This is
used as a communication point between multiple parts of the codebase,
and needs to be internally consistent between all the Samba tasks.
Andrew Bartlett
Autobuild-User: Andrew Bartlett <abartlet@samba.org>
Autobuild-Date: Wed Jun 1 05:30:53 CEST 2011 on sn-devel-104
| -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 0eae375bbc..c6fd38dd81 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -1660,7 +1660,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); +const 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 e41e8f17ae..c4cb37b088 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -6048,7 +6048,7 @@ 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) +FN_GLOBAL_CONST_STRING(lp_ncalrpc_dir, &Globals.ncalrpc_dir) /* local prototypes */ |