torture4: Use netlogon_pings() in rpc.lsa tests

Allow LDAPS netlogon ping

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>

diff --git a/source4/torture/rpc/lsa.c b/source4/torture/rpc/lsa.c
index 9093a8550c62cd7c28cb3a9e28a7b95bd979ad58..ab672f41d542838ae562126db527465e294f3e49 100644 (file)
--- a/source4/torture/rpc/lsa.c
+++ b/source4/torture/rpc/lsa.c
@@ -21,7 +21,7 @@
 
 #include "includes.h"
 #include "torture/torture.h"
-#include "libcli/cldap/cldap.h"
+#include "source3/libads/netlogon_ping.h"
 #include "../lib/tsocket/tsocket.h"
 #include "librpc/gen_ndr/ndr_lsa_c.h"
 #include "librpc/gen_ndr/netlogon.h"
@@ -4370,8 +4370,8 @@ static bool check_dom_trust_pw(struct dcerpc_pipe *p,
        const char *trusted_netbios_name = trusted->netbios_name.string;
        const char *trusted_dns_name = trusted->domain_name.string;
        struct tsocket_address *dest_addr;
-       struct cldap_socket *cldap;
-       struct cldap_netlogon cldap1;
+       struct netlogon_samlogon_response **responses = NULL;
+       struct netlogon_samlogon_response *resp = NULL;
        enum dcerpc_AuthType auth_type;
        enum dcerpc_AuthLevel auth_level;
 
@@ -4433,41 +4433,47 @@ static bool check_dom_trust_pw(struct dcerpc_pipe *p,
                                host,
                                389));
 
-       /* cldap_socket_init should now know about the dest. address */
-       status = cldap_socket_init(tctx, NULL, dest_addr, &cldap);
-       torture_assert_ntstatus_ok(tctx, status, "cldap_socket_init");
+       status = netlogon_pings(tctx, /* mem_ctx */
+                               lpcfg_client_netlogon_ping_protocol(
+                                       tctx->lp_ctx), /* proto */
+                               &dest_addr,            /* servers */
+                               1,                     /* num_servers */
+                               (struct netlogon_ping_filter){
+                                       .ntversion = NETLOGON_NT_VERSION_5 |
+                                                    NETLOGON_NT_VERSION_5EX,
+                                       .acct_ctrl = (secure_channel_type ==
+                                                     SEC_CHAN_DNS_DOMAIN)
+                                                            ? ACB_AUTOLOCK
+                                                            : ACB_DOMTRUST,
+                                       .user = account,
+                               },
+                               1, /* min_servers */
+                               tevent_timeval_current_ofs(2, 0), /* timeout */
+                               &responses);
+       torture_assert_ntstatus_ok(tctx, status, "netlogon_pings");
+
+       resp = responses[0];
 
-       ZERO_STRUCT(cldap1);
-       cldap1.in.dest_address = NULL;
-       cldap1.in.dest_port = 0;
-       cldap1.in.version = NETLOGON_NT_VERSION_5 | NETLOGON_NT_VERSION_5EX;
-       cldap1.in.user = account;
-       if (secure_channel_type == SEC_CHAN_DNS_DOMAIN) {
-               cldap1.in.acct_control = ACB_AUTOLOCK;
-       } else {
-               cldap1.in.acct_control = ACB_DOMTRUST;
-       }
-       status = cldap_netlogon(cldap, tctx, &cldap1);
-       torture_assert_ntstatus_ok(tctx, status, "cldap_netlogon");
        torture_assert_int_equal(tctx,
-                                cldap1.out.netlogon->ntver,
+                                resp->ntver,
                                 NETLOGON_NT_VERSION_5EX,
                                 "ntver");
        torture_assert_int_equal(tctx,
-                                cldap1.out.netlogon->data.nt5_ex.nt_version,
+                                resp->data.nt5_ex.nt_version,
                                 NETLOGON_NT_VERSION_1 |
                                         NETLOGON_NT_VERSION_5EX,
                                 "nt_version");
        torture_assert_int_equal(tctx,
-                                cldap1.out.netlogon->data.nt5_ex.command,
+                                resp->data.nt5_ex.command,
                                 LOGON_SAM_LOGON_RESPONSE_EX,
                                 "command");
        torture_assert_str_equal(tctx,
-                                cldap1.out.netlogon->data.nt5_ex.user_name,
-                                cldap1.in.user,
+                                resp->data.nt5_ex.user_name,
+                                account,
                                 "user_name");
-       server_name = talloc_asprintf(
-               tctx, "\\\\%s", cldap1.out.netlogon->data.nt5_ex.pdc_dns_name);
+       server_name = talloc_asprintf(tctx,
+                                     "\\\\%s",
+                                     resp->data.nt5_ex.pdc_dns_name);
        torture_assert(tctx, server_name, __location__);
 
        status = dcerpc_parse_binding(tctx, binding, &b2);