summaryrefslogtreecommitdiff
path: root/source3/param
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2000-01-29 00:03:50 +0000
committerJeremy Allison <jra@samba.org>2000-01-29 00:03:50 +0000
commitebfef23a7d255c68785bff4682117e09957bc23e (patch)
tree9a07feb64e63db3af2174ae3034e608d2a3c3909 /source3/param
parent40122f6e32627f2afaad0e66eb2f5f6eaa56a4e0 (diff)
downloadsamba-ebfef23a7d255c68785bff4682117e09957bc23e.tar.gz
samba-ebfef23a7d255c68785bff4682117e09957bc23e.tar.bz2
samba-ebfef23a7d255c68785bff4682117e09957bc23e.zip
Fix from Motonobu TAKAHASHI to sort code page parameters first.
Needed when reading the rest of smb.conf. Jeremy. (This used to be commit 171bef4d95390c1a74591fb06327cc993360a764)
Diffstat (limited to 'source3/param')
-rw-r--r--source3/param/loadparm.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index e0e4d60910..7655b8978b 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -548,6 +548,8 @@ static struct enum_list enum_ssl_version[] = {{SMB_SSL_V2, "ssl2"}, {SMB_SSL_V3,
static struct parm_struct parm_table[] =
{
{"Base Options", P_SEP, P_SEPARATOR},
+ {"coding system", P_STRING, P_GLOBAL, &Globals.szCodingSystem, handle_coding_system, NULL, 0},
+ {"client code page", P_INTEGER, P_GLOBAL, &Globals.client_code_page, handle_client_code_page, NULL, 0},
{"comment", P_STRING, P_LOCAL, &sDefault.comment, NULL, NULL, FLAG_BASIC|FLAG_SHARE|FLAG_PRINT|FLAG_DOS_STRING},
{"path", P_STRING, P_LOCAL, &sDefault.szPath, NULL, NULL, FLAG_BASIC|FLAG_SHARE|FLAG_PRINT|FLAG_DOS_STRING},
{"directory", P_STRING, P_LOCAL, &sDefault.szPath, NULL, NULL, FLAG_DOS_STRING},
@@ -720,8 +722,6 @@ static struct parm_struct parm_table[] =
{"strip dot", P_BOOL, P_GLOBAL, &Globals.bStripDot, NULL, NULL, 0},
{"character set", P_STRING, P_GLOBAL, &Globals.szCharacterSet, handle_character_set, NULL, 0},
{"mangled stack", P_INTEGER, P_GLOBAL, &Globals.mangled_stack, NULL, NULL, 0},
- {"coding system", P_STRING, P_GLOBAL, &Globals.szCodingSystem, handle_coding_system, NULL, 0},
- {"client code page", P_INTEGER, P_GLOBAL, &Globals.client_code_page, handle_client_code_page, NULL, 0},
{"default case", P_ENUM, P_LOCAL, &sDefault.iDefaultCase, NULL, enum_case, FLAG_SHARE},
{"case sensitive", P_BOOL, P_LOCAL, &sDefault.bCaseSensitive, NULL, NULL, FLAG_SHARE|FLAG_GLOBAL},
{"casesignames", P_BOOL, P_LOCAL, &sDefault.bCaseSensitive, NULL, NULL, 0},