Move all message structures to ntlm_common.h

struct wire_auth_msg was already there, we're about to want access to
struct wire_chal_msg, and we might as well keep them together.

diff --git a/src/ntlm.c b/src/ntlm.c
index 969e6842af9e0d4dff222b16d231661f86be40bc..aa1fbe6eaddd4098abce74df2409197f8418a4a5 100644 (file)
--- a/src/ntlm.c
+++ b/src/ntlm.c
@@ -35,28 +35,6 @@
 
 #include "ntlm.h"
 
-#pragma pack(push, 1)
-struct wire_neg_msg {
-    struct wire_msg_hdr header;
-    uint32_t neg_flags;
-    struct wire_field_hdr domain_name;
-    struct wire_field_hdr workstation_name;
-    uint8_t payload[]; /* variable */
-};
-#pragma pack(pop)
-
-#pragma pack(push, 1)
-struct wire_chal_msg {
-    struct wire_msg_hdr header;
-    struct wire_field_hdr target_name;
-    uint32_t neg_flags;
-    uint8_t server_challenge[8];
-    uint8_t reserved[8];
-    struct wire_field_hdr target_info;
-    uint8_t payload[]; /* variable */
-};
-#pragma pack(pop)
-
 #pragma pack(push, 1)
 struct wire_av_pair {
     uint16_t av_id;

diff --git a/src/ntlm_common.h b/src/ntlm_common.h
index 1c6217155df92c1fce1552f0f1c5ed2992d8a673..e3fe56e82437605da87a83d842c99af68479459d 100644 (file)
--- a/src/ntlm_common.h
+++ b/src/ntlm_common.h
@@ -76,6 +76,29 @@ struct wire_field_hdr {
 };
 #pragma pack(pop)
 
+#pragma pack(push, 1)
+struct wire_neg_msg {
+    struct wire_msg_hdr header;
+    uint32_t neg_flags;
+    struct wire_field_hdr domain_name;
+    struct wire_field_hdr workstation_name;
+    uint8_t payload[]; /* variable */
+};
+#pragma pack(pop)
+
+#pragma pack(push, 1)
+struct wire_chal_msg {
+    struct wire_msg_hdr header;
+    struct wire_field_hdr target_name;
+    uint32_t neg_flags;
+    uint8_t server_challenge[8];
+    uint8_t reserved[8];
+    struct wire_field_hdr target_info;
+    uint8_t payload[]; /* variable */
+};
+#pragma pack(pop)
+
+
 #pragma pack(push, 1)
 struct wire_auth_msg {
     struct wire_msg_hdr header;