libcli: Move "struct cldap_netlogon" definition to torture

This structure is only used in torture/ldap/netlogon.c now for
historic reasons. Replacing it with something else would be the right
thing to do...

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

diff --git a/libcli/cldap/cldap.h b/libcli/cldap/cldap.h
index 3a01f292e43a36e9a609a3eb71faebec8141d763..8c664ffaa6170cd2097e4e820903644325c3c5d5 100644 (file)
--- a/libcli/cldap/cldap.h
+++ b/libcli/cldap/cldap.h
@@ -92,26 +92,6 @@ NTSTATUS cldap_error_reply(struct cldap_socket *cldap,
                           int resultcode,
                           const char *errormessage);
 
-/*
-  a netlogon cldap request
-*/
-struct cldap_netlogon {
-       struct {
-               const char *dest_address;
-               uint16_t dest_port;
-               const char *realm;
-               const char *host;
-               const char *user;
-               const char *domain_guid;
-               const char *domain_sid;
-               int acct_control;
-               uint32_t version;
-       } in;
-       struct {
-               struct netlogon_samlogon_response *netlogon;
-       } out;
-};
-
 NTSTATUS cldap_netlogon_reply(struct cldap_socket *cldap,
                              uint32_t message_id,
                              struct tsocket_address *dst,

diff --git a/source4/torture/ldap/netlogon.c b/source4/torture/ldap/netlogon.c
index e881bd9cdbee32e19c924432227e07512571451d..61c383fc786dc0425f0542e811e6c43db84a8782 100644 (file)
--- a/source4/torture/ldap/netlogon.c
+++ b/source4/torture/ldap/netlogon.c
@@ -43,6 +43,23 @@
 
 #define CHECK_STRING(v, correct) torture_assert_str_equal(tctx, v, correct, "incorrect value");
 
+struct cldap_netlogon {
+       struct {
+               const char *dest_address;
+               uint16_t dest_port;
+               const char *realm;
+               const char *host;
+               const char *user;
+               const char *domain_guid;
+               const char *domain_sid;
+               int acct_control;
+               uint32_t version;
+       } in;
+       struct {
+               struct netlogon_samlogon_response *netlogon;
+       } out;
+};
+
 typedef NTSTATUS (*request_netlogon_t)(void *con,
                                       TALLOC_CTX *mem_ctx,
                                       struct cldap_netlogon *io);