diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-10-01 23:26:37 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 15:07:38 -0500 |
| commit | 5ecd526d1ca41821118165af039d16d0e729b59d (patch) | |
| tree | a162f3b10e6c43c820e38cf574c8f3fcefd3c957 /source4/param/loadparm.c | |
| parent | efa384375f61049d7e7c43a77dc8abe0e034e04d (diff) | |
| download | samba-5ecd526d1ca41821118165af039d16d0e729b59d.tar.gz samba-5ecd526d1ca41821118165af039d16d0e729b59d.tar.bz2 samba-5ecd526d1ca41821118165af039d16d0e729b59d.zip | |
r25456: Avoid externs for charsets for now - it breaks openchange.
(This used to be commit 836431af83674018e9700f9da92ce251d108687a)
Diffstat (limited to 'source4/param/loadparm.c')
| -rw-r--r-- | source4/param/loadparm.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c index 39b02f0ccb..a8a0a0393f 100644 --- a/source4/param/loadparm.c +++ b/source4/param/loadparm.c @@ -87,6 +87,9 @@ struct loadparm_global const char **smb_ports; char *ncalrpc_dir; + char *dos_charset; + char *unix_charset; + char *display_charset; char *szLockDir; char *szModulesDir; char *szPidDir; @@ -381,10 +384,10 @@ static struct parm_struct parm_table[] = { {"server role", P_ENUM, P_GLOBAL, &loadparm.Globals.server_role, NULL, enum_server_role, FLAG_BASIC}, - {"dos charset", P_STRING, P_GLOBAL, &dos_charset, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER}, - {"unix charset", P_STRING, P_GLOBAL, &unix_charset, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER}, + {"dos charset", P_STRING, P_GLOBAL, &loadparm.Globals.dos_charset, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER}, + {"unix charset", P_STRING, P_GLOBAL, &loadparm.Globals.unix_charset, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER}, {"ncalrpc dir", P_STRING, P_GLOBAL, &loadparm.Globals.ncalrpc_dir, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER}, - {"display charset", P_STRING, P_GLOBAL, &display_charset, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER}, + {"display charset", P_STRING, P_GLOBAL, &loadparm.Globals.display_charset, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER}, {"comment", P_STRING, P_LOCAL, &sDefault.comment, NULL, NULL, FLAG_BASIC | FLAG_ADVANCED | FLAG_SHARE | FLAG_PRINT | FLAG_DEVELOPER}, {"path", P_STRING, P_LOCAL, &sDefault.szPath, NULL, NULL, FLAG_BASIC | FLAG_ADVANCED | FLAG_SHARE | FLAG_PRINT | FLAG_DEVELOPER}, {"directory", P_STRING, P_LOCAL, &sDefault.szPath, NULL, NULL, FLAG_HIDE}, @@ -698,6 +701,9 @@ _PUBLIC_ FN_GLOBAL_STRING(lp_lockdir, szLockDir) _PUBLIC_ FN_GLOBAL_STRING(lp_modulesdir, szModulesDir) _PUBLIC_ FN_GLOBAL_STRING(lp_setupdir, szSetupDir) _PUBLIC_ FN_GLOBAL_STRING(lp_ncalrpc_dir, ncalrpc_dir) +_PUBLIC_ FN_GLOBAL_STRING(lp_dos_charset, dos_charset) +_PUBLIC_ FN_GLOBAL_STRING(lp_unix_charset, unix_charset) +_PUBLIC_ FN_GLOBAL_STRING(lp_display_charset, display_charset) _PUBLIC_ FN_GLOBAL_STRING(lp_piddir, szPidDir) _PUBLIC_ FN_GLOBAL_LIST(lp_dcerpc_endpoint_servers, dcerpc_ep_servers) _PUBLIC_ FN_GLOBAL_LIST(lp_server_services, server_services) |