summaryrefslogtreecommitdiff
path: root/source3/libads
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2002-11-23 14:27:56 +0000
committerGerald Carter <jerry@samba.org>2002-11-23 14:27:56 +0000
commit191dff2d279dd8315f093e313d8c149e786eb19f (patch)
tree2f0a9c9f08b31605b00a62639002fe2ae55c80ce /source3/libads
parent9c68f9064d487573fa94d7decfb1bd68afd37070 (diff)
downloadsamba-191dff2d279dd8315f093e313d8c149e786eb19f.tar.gz
samba-191dff2d279dd8315f093e313d8c149e786eb19f.tar.bz2
samba-191dff2d279dd8315f093e313d8c149e786eb19f.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 c31a17889e3e4daf7c1e807038efc2c0fba78be3)
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])));