diff options
Diffstat (limited to 'source3/param/loadparm.c')
| -rw-r--r-- | source3/param/loadparm.c | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 13454641fb..3fa3773276 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -119,7 +119,11 @@ typedef struct char *szPasswdChat; char *szLogFile; char *szConfigFile; +/*#ifdef WITH_TDBPWD + char *szTDBPasswdFile; +#else*/ char *szSMBPasswdFile; +/* #endif */ char *szPasswordServer; char *szSocketOptions; char *szValidChars; @@ -657,7 +661,11 @@ static struct parm_struct parm_table[] = { {"map to guest", P_ENUM, P_GLOBAL, &Globals.map_to_guest, NULL, enum_map_to_guest, 0}, {"null passwords", P_BOOL, P_GLOBAL, &Globals.bNullPasswords, NULL, NULL, 0}, {"password server", P_STRING, P_GLOBAL, &Globals.szPasswordServer, NULL, NULL, 0}, +/* #ifdef WITH_TDBPWD + {"tdb passwd file", P_STRING, P_GLOBAL, &Globals.szTDBPasswdFile, NULL, NULL, 0}, +#else */ {"smb passwd file", P_STRING, P_GLOBAL, &Globals.szSMBPasswdFile, NULL, NULL, 0}, +/* #endif */ {"root directory", P_STRING, P_GLOBAL, &Globals.szRootdir, NULL, NULL, 0}, {"root dir", P_STRING, P_GLOBAL, &Globals.szRootdir, NULL, NULL, 0}, {"root", P_STRING, P_GLOBAL, &Globals.szRootdir, NULL, NULL, 0}, @@ -1116,7 +1124,14 @@ static void init_globals(void) DEBUG(3, ("Initialising global parameters\n")); +/* #ifdef WITH_TDBPWD + string_set(&Globals.szTDBPasswdFile, TDB_PASSWD_FILE); +#else */ +#ifdef WITH_TDBPWD + string_set(&Globals.szSMBPasswdFile, TDB_PASSWD_FILE); +#else string_set(&Globals.szSMBPasswdFile, SMB_PASSWD_FILE); +#endif /* * Allow the default PASSWD_CHAT to be overridden in local.h. */ @@ -1342,7 +1357,11 @@ static char *lp_string(const char *s) FN_GLOBAL_STRING(lp_logfile, &Globals.szLogFile) FN_GLOBAL_STRING(lp_smbrun, &Globals.szSmbrun) FN_GLOBAL_STRING(lp_configfile, &Globals.szConfigFile) +/* #ifdef WITH_TDBPWD +FN_GLOBAL_STRING(lp_tdb_passwd_file, &Globals.szTDBPasswdFile) +#else */ FN_GLOBAL_STRING(lp_smb_passwd_file, &Globals.szSMBPasswdFile) +/* #endif */ FN_GLOBAL_STRING(lp_serverstring, &Globals.szServerString) FN_GLOBAL_STRING(lp_printcapname, &Globals.szPrintcapname) FN_GLOBAL_STRING(lp_enumports_cmd, &Globals.szEnumPortsCommand) |