From: Russ Combs (rucombs) <rucombs@cisco.com>
Date: Fri, 26 Oct 2018 14:27:06 +0000 (-0400)
Subject: Merge pull request #1402 in SNORT/snort3 from dce_pragma to master
X-Git-Tag: 3.0.0-249~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=08fd00a3869abea7932fd43c56455d9b618d74ce;p=thirdparty%2Fsnort3.git

Merge pull request #1402 in SNORT/snort3 from dce_pragma to master

Squashed commit of the following:

commit 923c3773ec0b12d79f4ffebe49ffd219c5649056
Author: Carter Waxman <cwaxman@cisco.com>
Date:   Wed Oct 24 16:05:29 2018 -0400

    dcerpc: fixed build warning with struct packing
---

diff --git a/src/service_inspectors/dce_rpc/smb_common.h b/src/service_inspectors/dce_rpc/smb_common.h
index 1a01285e2..29350caf3 100644
--- a/src/service_inspectors/dce_rpc/smb_common.h
+++ b/src/service_inspectors/dce_rpc/smb_common.h
@@ -455,5 +455,7 @@ inline bool SmbFmtAscii(const uint8_t fmt)
     return fmt == SMB_FMT__ASCII ? true : false;
 }
 
+#pragma pack()
+
 #endif
 
diff --git a/src/service_inspectors/dce_rpc/smb_message.h b/src/service_inspectors/dce_rpc/smb_message.h
index f970ef7f5..474b6847b 100644
--- a/src/service_inspectors/dce_rpc/smb_message.h
+++ b/src/service_inspectors/dce_rpc/smb_message.h
@@ -30,6 +30,8 @@ namespace snort
 struct Packet;
 }
 
+#pragma pack(1)
+
 /********************************************************************
  * SMB_COM_OPEN
  ********************************************************************/