From 08fd00a3869abea7932fd43c56455d9b618d74ce Mon Sep 17 00:00:00 2001 From: "Russ Combs (rucombs)" Date: Fri, 26 Oct 2018 10:27:06 -0400 Subject: [PATCH] Merge pull request #1402 in SNORT/snort3 from dce_pragma to master Squashed commit of the following: commit 923c3773ec0b12d79f4ffebe49ffd219c5649056 Author: Carter Waxman Date: Wed Oct 24 16:05:29 2018 -0400 dcerpc: fixed build warning with struct packing --- src/service_inspectors/dce_rpc/smb_common.h | 2 ++ src/service_inspectors/dce_rpc/smb_message.h | 2 ++ 2 files changed, 4 insertions(+) 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 ********************************************************************/ -- 2.47.3