r1750: This patch allows net ads lookup to rely on command line arguments if contacti...

from aliguori@us.ibm.com
(This used to be commit edb4e940b45cbb06a93004b15fc45a7a45a42498)

diff --git a/source3/utils/net_ads.c b/source3/utils/net_ads.c
index 7b8ace85b6248f51c3e2028a019875e7fda6b4a9..2efd470bbe711970360ffc02ba09ffc7cecf97f0 100644 (file)
--- a/source3/utils/net_ads.c
+++ b/source3/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/source3/utils/net_ads_cldap.c b/source3/utils/net_ads_cldap.c
index 1903172cf75d8ac8790f83e3d04cddf96c473cde..f3c6c5ff4d276ae89f8f17f583cecae94d9446d9 100644 (file)
--- a/source3/utils/net_ads_cldap.c
+++ b/source3/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),