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 | 3ab6fcc5c6160d322bdfd2ca771dcf7954e92df7 (patch) | |
| tree | 79b11f5d6c2e48f37f7d589b10872dde741ee28a /source3/auth/auth_domain.c | |
| parent | f230981e2cfc6809e50c11987c47b8dbc1727f41 (diff) | |
| download | samba-3ab6fcc5c6160d322bdfd2ca771dcf7954e92df7.tar.gz samba-3ab6fcc5c6160d322bdfd2ca771dcf7954e92df7.tar.bz2 samba-3ab6fcc5c6160d322bdfd2ca771dcf7954e92df7.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
(This used to be commit 016ef8b36b30846311a5321803298f8e28719244)
Diffstat (limited to 'source3/auth/auth_domain.c')
| -rw-r--r-- | source3/auth/auth_domain.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source3/auth/auth_domain.c b/source3/auth/auth_domain.c index 2a6614e28e..eebe647ec0 100644 --- a/source3/auth/auth_domain.c +++ b/source3/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 = |