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 1a01285e2dd53be996516ed44106866aff93d81f..29350caf3a77b6eabf2fb60fb939592994ae9c72 100644 (file)
--- 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 f970ef7f53904cfd98023cabf32e60ccb2daa9de..474b6847b9e17333f8547e35fff19da79d2f2b49 100644 (file)
--- 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
  ********************************************************************/