From: Jim McDonough <jmcd@samba.org>
Date: Thu, 12 Aug 2004 03:28:57 +0000 (+0000)
Subject: r1750: This patch allows net ads lookup to rely on command line arguments if contacti... 
X-Git-Tag: samba-misc-tags/initial-v3-0-unstable~5926
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=edb4e940b45cbb06a93004b15fc45a7a45a42498;p=thirdparty%2Fsamba.git

r1750: This patch allows net ads lookup to rely on command line arguments if contacting an ADS server fails.  This allows net ads lookup to work with clapd (very useful for testing).

from aliguori@us.ibm.com
---

diff --git a/source/utils/net_ads.c b/source/utils/net_ads.c
index 7b8ace85b62..2efd470bbe7 100644
--- a/source/utils/net_ads.c
+++ b/source/utils/net_ads.c
@@ -77,9 +77,12 @@ static int net_ads_lookup(int argc, const char **argv)
 
 	ads_connect(ads);
 
-	if (!ads || !ads->config.realm) {
+	if (!ads) {
 		d_printf("Didn't find the cldap server!\n");
 		return -1;
+	} if (!ads->config.realm) {
+		ads->config.realm = opt_target_workgroup;
+		ads->ldap_port = 389;
 	}
 
 	return ads_cldap_netlogon(ads);
diff --git a/source/utils/net_ads_cldap.c b/source/utils/net_ads_cldap.c
index 1903172cf75..f3c6c5ff4d2 100644
--- a/source/utils/net_ads_cldap.c
+++ b/source/utils/net_ads_cldap.c
@@ -280,8 +280,9 @@ int ads_cldap_netlogon(ADS_STRUCT *ads)
 	int sock;
 	int ret;
 	struct cldap_netlogon_reply reply;
+	const char *target = opt_host ? opt_host : inet_ntoa(ads->ldap_ip);
 
-	sock = open_udp_socket(inet_ntoa(ads->ldap_ip), ads->ldap_port);
+	sock = open_udp_socket(target, ads->ldap_port);
 	if (sock == -1) {
 		d_printf("Failed to open udp socket to %s:%u\n", 
 			 inet_ntoa(ads->ldap_ip),