summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2012-05-28 16:34:14 +1000
committerAndrew Bartlett <abartlet@samba.org>2012-05-30 04:15:11 +0200
commit89981c7b17f84cb8d6b8bf0271a2f2869f3a3a99 (patch)
tree5ee23356a3ac072533995eded93d81a34f0aa9e2
parentf0d53009383ed9055f8daaf2f589e8c32cdeb3d8 (diff)
downloadsamba-89981c7b17f84cb8d6b8bf0271a2f2869f3a3a99.tar.gz
samba-89981c7b17f84cb8d6b8bf0271a2f2869f3a3a99.tar.bz2
samba-89981c7b17f84cb8d6b8bf0271a2f2869f3a3a99.zip
lib/param: Mark a few more parameters const (matching s3)
While this makes no difference in the lib/param code, this allows the C files to be compared and merged. Andrew Bartlett
-rw-r--r--lib/param/loadparm.c25
1 files changed, 13 insertions, 12 deletions
diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c
index 3ac5a4dd27..149015d978 100644
--- a/lib/param/loadparm.c
+++ b/lib/param/loadparm.c
@@ -1561,15 +1561,27 @@ FN_GLOBAL_BOOL(we_are_a_wins_server, bWINSsupport)
FN_GLOBAL_BOOL(winbind_sealed_pipes, bWinbindSealedPipes)
FN_GLOBAL_BOOL(wins_dns_proxy, bWINSdnsProxy)
FN_GLOBAL_BOOL(writeraw, bWriteRaw)
+FN_GLOBAL_CONST_STRING(dnsdomain, szRealm_lower)
FN_GLOBAL_CONST_STRING(dns_forwarder, dns_forwarder)
+FN_GLOBAL_CONST_STRING(dos_charset, dos_charset)
+FN_GLOBAL_CONST_STRING(lockdir, szLockDir)
+FN_GLOBAL_CONST_STRING(ncalrpc_dir, ncalrpc_dir)
+FN_GLOBAL_CONST_STRING(netbios_name, szNetbiosName)
+FN_GLOBAL_CONST_STRING(netbios_scope, szNetbiosScope)
FN_GLOBAL_CONST_STRING(ntp_signd_socket_directory, szNTPSignDSocketDirectory)
+FN_GLOBAL_CONST_STRING(passdb_backend, passdb_backend)
FN_GLOBAL_CONST_STRING(passwordserver, szPasswordServer)
+FN_GLOBAL_CONST_STRING(piddir, szPidDir)
+FN_GLOBAL_CONST_STRING(private_dir, szPrivateDir)
FN_GLOBAL_CONST_STRING(realm, szRealm_upper)
+FN_GLOBAL_CONST_STRING(socket_options, socket_options)
FN_GLOBAL_CONST_STRING(template_homedir, szTemplateHomedir)
FN_GLOBAL_CONST_STRING(template_shell, szTemplateShell)
+FN_GLOBAL_CONST_STRING(unix_charset, unix_charset)
FN_GLOBAL_CONST_STRING(winbindd_privileged_socket_directory, szWinbinddPrivilegedSocketDirectory)
FN_GLOBAL_CONST_STRING(winbindd_socket_directory, szWinbinddSocketDirectory)
FN_GLOBAL_CONST_STRING(winbind_separator, szWinbindSeparator)
+FN_GLOBAL_CONST_STRING(workgroup, szWorkgroup)
FN_GLOBAL_INTEGER(allow_dns_updates, allow_dns_updates)
FN_GLOBAL_INTEGER(cldap_port, cldap_port)
FN_GLOBAL_INTEGER(client_signing, client_signing)
@@ -1602,26 +1614,15 @@ FN_GLOBAL_LIST(spn_update_command, szSPNUpdateCommand)
FN_GLOBAL_LIST(wins_server_list, szWINSservers)
FN_GLOBAL_STRING(auto_services, szAutoServices)
FN_GLOBAL_STRING(cachedir, szCacheDir)
-FN_GLOBAL_STRING(dnsdomain, szRealm_lower)
-FN_GLOBAL_STRING(dos_charset, dos_charset)
-FN_GLOBAL_STRING(lockdir, szLockDir)
FN_GLOBAL_STRING(logfile, logfile)
-FN_GLOBAL_STRING(ncalrpc_dir, ncalrpc_dir)
-FN_GLOBAL_STRING(netbios_name, szNetbiosName)
-FN_GLOBAL_STRING(netbios_scope, szNetbiosScope)
FN_GLOBAL_STRING(ntptr_providor, ntptr_providor)
-FN_GLOBAL_STRING(passdb_backend, passdb_backend)
FN_GLOBAL_STRING(passwd_chat, szPasswdChat)
-FN_GLOBAL_STRING(piddir, szPidDir)
-FN_GLOBAL_STRING(private_dir, szPrivateDir)
FN_GLOBAL_STRING(serverstring, szServerString)
FN_GLOBAL_STRING(share_backend, szShareBackend)
FN_GLOBAL_STRING(socket_address, szSocketAddress)
-FN_GLOBAL_STRING(socket_options, socket_options)
FN_GLOBAL_STRING(statedir, szStateDir)
-FN_GLOBAL_STRING(unix_charset, unix_charset)
FN_GLOBAL_STRING(wins_hook, szWINSHook)
-FN_GLOBAL_STRING(workgroup, szWorkgroup)
+
/* local prototypes */
static int map_parameter(const char *pszParmName);