diff options
| author | Andrew Tridgell <tridge@samba.org> | 2005-01-21 13:13:24 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:09:04 -0500 |
| commit | 6f0aef31cdfa9b486d1f2e0f097e071830f5600d (patch) | |
| tree | 01891cccf49ab3bde362968bf10af93796c20107 /source4/param | |
| parent | 757a063a134ab466f437e60b1eed5215b992d80c (diff) | |
| download | samba-6f0aef31cdfa9b486d1f2e0f097e071830f5600d.tar.gz samba-6f0aef31cdfa9b486d1f2e0f097e071830f5600d.tar.bz2 samba-6f0aef31cdfa9b486d1f2e0f097e071830f5600d.zip | |
r4898: - removed the unused wins_srv_*() code
- expanded the generic async name resolver to try multiple methods
- added wins resolutions to the list of methods tried
- fixed up the random trn id generation to use the good random generator
(This used to be commit 266fd2751c01808e5a18d4094032af50554ceb7a)
Diffstat (limited to 'source4/param')
| -rw-r--r-- | source4/param/loadparm.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c index 616cf50afb..0582d55511 100644 --- a/source4/param/loadparm.c +++ b/source4/param/loadparm.c @@ -190,7 +190,7 @@ typedef struct char **szNetbiosAliases; char *szNetbiosScope; char *szDomainOtherSIDs; - char *szNameResolveOrder; + char **szNameResolveOrder; char *szPanicAction; char *szAddUserScript; char *szAddMachineScript; @@ -627,7 +627,7 @@ static struct parm_struct parm_table[] = { {"max mux", P_INTEGER, P_GLOBAL, &Globals.max_mux, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER}, {"max xmit", P_INTEGER, P_GLOBAL, &Globals.max_xmit, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER}, - {"name resolve order", P_STRING, P_GLOBAL, &Globals.szNameResolveOrder, NULL, NULL, FLAG_ADVANCED | FLAG_WIZARD | FLAG_DEVELOPER}, + {"name resolve order", P_LIST, P_GLOBAL, &Globals.szNameResolveOrder, NULL, NULL, FLAG_ADVANCED | FLAG_WIZARD | FLAG_DEVELOPER}, {"max ttl", P_INTEGER, P_GLOBAL, &Globals.max_ttl, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER}, {"max wins ttl", P_INTEGER, P_GLOBAL, &Globals.max_wins_ttl, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER}, {"min wins ttl", P_INTEGER, P_GLOBAL, &Globals.min_wins_ttl, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER}, @@ -1164,7 +1164,7 @@ 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_LIST(lp_passwordserver, &Globals.szPasswordServers) -FN_GLOBAL_STRING(lp_name_resolve_order, &Globals.szNameResolveOrder) +FN_GLOBAL_LIST(lp_name_resolve_order, &Globals.szNameResolveOrder) FN_GLOBAL_STRING(lp_realm, &Globals.szRealm) FN_GLOBAL_STRING(lp_ads_server, &Globals.szADSserver) FN_GLOBAL_STRING(lp_socket_options, &Globals.socket_options) |