nbt: move netlogon_samlogon_response into librpc/ndr/ndr_nbt.h.

Guenther

diff --git a/libcli/netlogon/netlogon.h b/libcli/netlogon/netlogon.h
index a68c7fab82abfa24c7aeb2f41ff4757c06cf379e..0bf2a4c85c08fecdc458f630a46d80d4e7be948e 100644 (file)
--- a/libcli/netlogon/netlogon.h
+++ b/libcli/netlogon/netlogon.h
@@ -27,17 +27,6 @@
 #include "librpc/gen_ndr/ndr_misc.h"
 #include "librpc/gen_ndr/ndr_security.h"
 
-struct netlogon_samlogon_response
-{
-       uint32_t ntver;
-       union {
-               struct NETLOGON_SAM_LOGON_RESPONSE_NT40 nt4;
-               struct NETLOGON_SAM_LOGON_RESPONSE nt5;
-               struct NETLOGON_SAM_LOGON_RESPONSE_EX nt5_ex;
-       } data;
-
-};
-
 struct nbt_netlogon_response
 {
        enum {NETLOGON_GET_PDC, NETLOGON_SAMLOGON, NETLOGON_RESPONSE2} response_type;

diff --git a/librpc/ndr/ndr_nbt.h b/librpc/ndr/ndr_nbt.h
index 65975765cbfe5f4d132b9d931919eaaa4e88b1dc..bda0e210cfe829fa307ce71ce86c2d36613f19cb 100644 (file)
--- a/librpc/ndr/ndr_nbt.h
+++ b/librpc/ndr/ndr_nbt.h
@@ -29,6 +29,17 @@
 
 NDR_SCALAR_PROTO(nbt_string, const char *)
 
+struct netlogon_samlogon_response
+{
+       uint32_t ntver;
+       union {
+               struct NETLOGON_SAM_LOGON_RESPONSE_NT40 nt4;
+               struct NETLOGON_SAM_LOGON_RESPONSE nt5;
+               struct NETLOGON_SAM_LOGON_RESPONSE_EX nt5_ex;
+       } data;
+
+};
+
 enum ndr_err_code ndr_push_NETLOGON_SAM_LOGON_REQUEST(struct ndr_push *ndr, int ndr_flags, const struct NETLOGON_SAM_LOGON_REQUEST *r);
 enum ndr_err_code ndr_pull_NETLOGON_SAM_LOGON_REQUEST(struct ndr_pull *ndr, int ndr_flags, struct NETLOGON_SAM_LOGON_REQUEST *r);
 enum ndr_err_code ndr_push_NETLOGON_SAM_LOGON_RESPONSE_EX_with_flags(struct ndr_push *ndr, int ndr_flags, const struct NETLOGON_SAM_LOGON_RESPONSE_EX *r);