diff options
| author | Andrew Tridgell <tridge@samba.org> | 2001-09-07 14:14:57 +0000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2001-09-07 14:14:57 +0000 |
| commit | 5573a1c7394362f5e46c58b8cfaf6bf7a080c391 (patch) | |
| tree | fffa468b63bbb72701e4ed06667fbdf3459ea19b /source3/param | |
| parent | 83ebf2b6b282926930dc2c5dee3b5f18447d6e81 (diff) | |
| download | samba-5573a1c7394362f5e46c58b8cfaf6bf7a080c391.tar.gz samba-5573a1c7394362f5e46c58b8cfaf6bf7a080c391.tar.bz2 samba-5573a1c7394362f5e46c58b8cfaf6bf7a080c391.zip | |
added "display charset" option in smb.conf, along with d_printf()
which should now be used instead of DEBUG(0) or printf() for
interactive messages
I have only converted client.c to use d_printf(), and the code hasn't
had much testing yet. Eventually we want all interactive code to use
d_printf(), plus SWAT
(This used to be commit 266d8e67669adb329f25676c4bc4d4c50f223428)
Diffstat (limited to 'source3/param')
| -rw-r--r-- | source3/param/loadparm.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 95ba076977..5e7bb60f69 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -89,6 +89,7 @@ typedef struct { char *dos_charset; char *unix_charset; + char *display_charset; char *szPrintcapname; char *szEnumPortsCommand; char *szAddPrinterCommand; @@ -639,6 +640,7 @@ static struct parm_struct parm_table[] = { {"dos charset", P_STRING, P_GLOBAL, &Globals.dos_charset, NULL, NULL, 0}, {"unix charset", P_STRING, P_GLOBAL, &Globals.unix_charset, NULL, NULL, 0}, + {"display charset", P_STRING, P_GLOBAL, &Globals.display_charset, NULL, NULL, 0}, {"comment", P_STRING, P_LOCAL, &sDefault.comment, NULL, NULL, FLAG_BASIC | FLAG_SHARE | FLAG_PRINT}, {"path", P_STRING, P_LOCAL, &sDefault.szPath, NULL, NULL, FLAG_BASIC | FLAG_SHARE | FLAG_PRINT}, {"directory", P_STRING, P_LOCAL, &sDefault.szPath, NULL, NULL, 0}, @@ -1418,6 +1420,9 @@ static char *lp_string(const char *s) #define FN_LOCAL_INTEGER(fn_name,val) \ int fn_name(int i) {return(LP_SNUM_OK(i)? ServicePtrs[(i)]->val : sDefault.val);} +FN_GLOBAL_STRING(lp_dos_charset, &Globals.dos_charset) +FN_GLOBAL_STRING(lp_unix_charset, &Globals.unix_charset) +FN_GLOBAL_STRING(lp_display_charset, &Globals.display_charset) FN_GLOBAL_STRING(lp_logfile, &Globals.szLogFile) FN_GLOBAL_STRING(lp_configfile, &Globals.szConfigFile) FN_GLOBAL_STRING(lp_smb_passwd_file, &Globals.szSMBPasswdFile) @@ -3277,7 +3282,7 @@ BOOL lp_load(char *pszFname, BOOL global_only, BOOL save_defaults, string_set(&Globals.szWINSserver, "127.0.0.1"); } - init_iconv(Globals.unix_charset, Globals.dos_charset); + init_iconv(); return (bRetval); } |