diff options
| author | Gerald Carter <jerry@samba.org> | 2002-11-23 14:52:34 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2002-11-23 14:52:34 +0000 |
| commit | 016ef8b36b30846311a5321803298f8e28719244 (patch) | |
| tree | 9f68dd3c5145d0c6655da14a3b5bbbd166ece858 /source/auth | |
| parent | 7daa880503f9ad6ae24a26f708c03ff1d119b7c0 (diff) | |
| download | samba-016ef8b36b30846311a5321803298f8e28719244.tar.gz samba-016ef8b36b30846311a5321803298f8e28719244.tar.xz samba-016ef8b36b30846311a5321803298f8e28719244.zip | |
[merge from APP_HEAD]
90% fix for CR 1076. The password server parameter will no take things
like
password server = DC1 *
which means to contact DC1 first and the go to auto lookup if it
fails.
jerry
Diffstat (limited to 'source/auth')
| -rw-r--r-- | source/auth/auth_domain.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/auth/auth_domain.c b/source/auth/auth_domain.c index 2a6614e28e6..eebe647ec02 100644 --- a/source/auth/auth_domain.c +++ b/source/auth/auth_domain.c @@ -275,6 +275,7 @@ static NTSTATUS find_connect_pdc(struct cli_state **cli, NTSTATUS nt_status = NT_STATUS_NO_LOGON_SERVERS; time_t time_now = time(NULL); BOOL use_pdc_only = False; + BOOL list_ordered; /* * If the time the machine password has changed @@ -301,7 +302,7 @@ static NTSTATUS find_connect_pdc(struct cli_state **cli, count = 1; } else { - if (!get_dc_list(domain, &ip_list, &count)) + if (!get_dc_list(domain, &ip_list, &count, &list_ordered)) return NT_STATUS_NO_LOGON_SERVERS; } @@ -310,7 +311,7 @@ static NTSTATUS find_connect_pdc(struct cli_state **cli, * network address as any of our interfaces. */ for(i = 0; i < count; i++) { - if(!is_local_net(ip_list[i])) + if( !list_ordered && !is_local_net(ip_list[i]) ) continue; if(NT_STATUS_IS_OK(nt_status = |