summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2005-01-13 18:23:28 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:08:48 -0500
commitada17c6794da2988fea7e800c60ca7e83d23eb7e (patch)
tree59a4eaedea3ec26003ef32a7268946431ff66e1e
parent13b2f56f17b66fa9b87697900fb55bc3141b7481 (diff)
downloadsamba-ada17c6794da2988fea7e800c60ca7e83d23eb7e.tar.gz
samba-ada17c6794da2988fea7e800c60ca7e83d23eb7e.tar.bz2
samba-ada17c6794da2988fea7e800c60ca7e83d23eb7e.zip
r4725: make "password server" a string list
metze (This used to be commit 5287ec0818cf38cc5d3ef2a21518c98b700116fb)
-rw-r--r--source4/param/loadparm.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c
index eed10fb44c..33559aa528 100644
--- a/source4/param/loadparm.c
+++ b/source4/param/loadparm.c
@@ -170,7 +170,7 @@ typedef struct
char *szSPOOLSS_URL;
char *szPrivateDir;
char **szPreloadModules;
- char *szPasswordServer;
+ char **szPasswordServers;
char *szSocketOptions;
char *szRealm;
char *szADSserver;
@@ -561,7 +561,7 @@ static struct parm_struct parm_table[] = {
{"idmap backend", P_STRING, P_GLOBAL, &Globals.szIDMapBackend, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
{"null passwords", P_BOOL, P_GLOBAL, &Globals.bNullPasswords, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
{"obey pam restrictions", P_BOOL, P_GLOBAL, &Globals.bObeyPamRestrictions, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
- {"password server", P_STRING, P_GLOBAL, &Globals.szPasswordServer, NULL, NULL, FLAG_ADVANCED | FLAG_WIZARD | FLAG_DEVELOPER},
+ {"password server", P_LIST, P_GLOBAL, &Globals.szPasswordServers, NULL, NULL, FLAG_ADVANCED | FLAG_WIZARD | FLAG_DEVELOPER},
{"smb passwd file", P_STRING, P_GLOBAL, &Globals.szSMBPasswdFile, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
{"sam database", P_STRING, P_GLOBAL, &Globals.szSAM_URL, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
{"spoolss database", P_STRING, P_GLOBAL, &Globals.szSPOOLSS_URL, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
@@ -1162,7 +1162,7 @@ FN_GLOBAL_STRING(lp_hosts_equiv, &Globals.szHostsEquiv)
FN_GLOBAL_STRING(lp_auto_services, &Globals.szAutoServices)
FN_GLOBAL_STRING(lp_passwd_program, &Globals.szPasswdProgram)
FN_GLOBAL_STRING(lp_passwd_chat, &Globals.szPasswdChat)
-FN_GLOBAL_STRING(lp_passwordserver, &Globals.szPasswordServer)
+FN_GLOBAL_LIST(lp_passwordserver, &Globals.szPasswordServers)
FN_GLOBAL_STRING(lp_name_resolve_order, &Globals.szNameResolveOrder)
FN_GLOBAL_STRING(lp_realm, &Globals.szRealm)
FN_GLOBAL_STRING(lp_ads_server, &Globals.szADSserver)