From: Michael Altizer <mialtize@cisco.com>
Date: Tue, 20 Nov 2018 00:00:36 +0000 (-0500)
Subject: actions: Fix merge conflict between action objectification and reject action update
X-Git-Tag: 3.0.0-250~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e97821d391a9310d5e3ec0cfa1c11f9a1dcbaa74;p=thirdparty%2Fsnort3.git

actions: Fix merge conflict between action objectification and reject action update
---

diff --git a/src/actions/act_reject.cc b/src/actions/act_reject.cc
index 5e58437c8..9a8d85251 100644
--- a/src/actions/act_reject.cc
+++ b/src/actions/act_reject.cc
@@ -139,7 +139,7 @@ void RejectAction::send(Packet* p)
         act->send_reset(p, ENC_FLAG_FWD);
 
     if ( flags & REJ_UNR_FWD )
-        Active::send_unreach(p, snort::UnreachResponse::FWD);
+        act->send_unreach(p, snort::UnreachResponse::FWD);
 
     if ( flags & REJ_UNR_NET )
         act->send_unreach(p, snort::UnreachResponse::NET);