summaryrefslogtreecommitdiff
path: root/source3/libads
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2002-11-23 14:52:34 +0000
committerGerald Carter <jerry@samba.org>2002-11-23 14:52:34 +0000
commit3ab6fcc5c6160d322bdfd2ca771dcf7954e92df7 (patch)
tree79b11f5d6c2e48f37f7d589b10872dde741ee28a /source3/libads
parentf230981e2cfc6809e50c11987c47b8dbc1727f41 (diff)
downloadsamba-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/libads')
-rw-r--r--source3/libads/ldap.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/source3/libads/ldap.c b/source3/libads/ldap.c
index 60427323b0..fcb96dd174 100644
--- a/source3/libads/ldap.c
+++ b/source3/libads/ldap.c
@@ -186,6 +186,7 @@ static BOOL ads_try_netbios(ADS_STRUCT *ads)
int count;
int i;
const char *workgroup = ads->server.workgroup;
+ BOOL list_ordered;
if (!workgroup) {
workgroup = lp_workgroup();
@@ -202,7 +203,7 @@ static BOOL ads_try_netbios(ADS_STRUCT *ads)
}
/* now any DC, including backups */
- if (get_dc_list(workgroup, &ip_list, &count)) {
+ if (get_dc_list(workgroup, &ip_list, &count, &list_ordered)) {
for (i=0;i<count;i++) {
DEBUG(6,("ads_try_netbios: trying server '%s'\n",
inet_ntoa(ip_list[i])));