diff options
author | Jeremy Allison <jra@samba.org> | 2000-10-06 23:35:55 +0000 |
---|---|---|
committer | Jeremy Allison <jra@samba.org> | 2000-10-06 23:35:55 +0000 |
commit | 077c41cc60316c44d2f3f85e14fe15acd22ccc1f (patch) | |
tree | 95a55fe7d01ab0279228ff52d6e5b36679da8d73 /source3/param | |
parent | 74d4a3b7410547d9f65bfc26de5f22c623574afd (diff) | |
download | samba-077c41cc60316c44d2f3f85e14fe15acd22ccc1f.tar.gz samba-077c41cc60316c44d2f3f85e14fe15acd22ccc1f.tar.bz2 samba-077c41cc60316c44d2f3f85e14fe15acd22ccc1f.zip |
Fix for printf attribute from Mattias Gronlund <Mattias.Gronlund@sa.erisoft.se>
Added "codepage directory" patch from Peter.Polkinghorne@brunel.ac.uk
Jeremy.
(This used to be commit e49566c2e21fcd16980e5110495645c5ae5a36da)
Diffstat (limited to 'source3/param')
-rw-r--r-- | source3/param/loadparm.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 525c1931cc..452c207dfb 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -135,6 +135,7 @@ typedef struct char *szGroupnameMap; #endif /* USING_GROUPNAME_MAP */ char *szCharacterSet; + char *szCodePageDir; char *szLogonScript; char *szLogonPath; char *szLogonDrive; @@ -627,6 +628,7 @@ static struct parm_struct parm_table[] = { {"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}, + {"code page directory", P_STRING, P_GLOBAL, &Globals.szCodePageDir, NULL, 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}, @@ -1136,6 +1138,7 @@ static void init_globals(void) string_set(&Globals.szLogonPath, "\\\\%N\\%U\\profile"); string_set(&Globals.szNameResolveOrder, "lmhosts host wins bcast"); + string_set(&Globals.szCodePageDir, CODEPAGEDIR); Globals.bLoadPrinters = True; Globals.bUseRhosts = False; @@ -1384,6 +1387,7 @@ FN_GLOBAL_STRING(lp_winbind_gid, &Globals.szWinbindGID) FN_GLOBAL_STRING(lp_template_homedir, &Globals.szTemplateHomedir) FN_GLOBAL_STRING(lp_template_shell, &Globals.szTemplateShell) FN_GLOBAL_STRING(lp_winbind_separator, &Globals.szWinbindSeparator) +FN_GLOBAL_STRING(lp_codepagedir,&Globals.szCodePageDir) #ifdef WITH_LDAP FN_GLOBAL_STRING(lp_ldap_server, &Globals.szLdapServer); FN_GLOBAL_STRING(lp_ldap_suffix, &Globals.szLdapSuffix); |