From: Mike Stepanek (mstepane) <mstepane@cisco.com>
Date: Mon, 17 Jun 2019 19:15:06 +0000 (-0400)
Subject: Merge pull request #1644 in SNORT/snort3 from ~KATHARVE/snort3:ips_policies_bug to... 
X-Git-Tag: 3.0.0-257~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0f1bfa63a266b5cbfd0575e1730af53936f4a821;p=thirdparty%2Fsnort3.git

Merge pull request #1644 in SNORT/snort3 from ~KATHARVE/snort3:ips_policies_bug to master

Squashed commit of the following:

commit 6153c7a79d13ab80939e7763d083c966029bccfd
Author: Katura Harvey <katharve@cisco.com>
Date:   Wed Jun 12 12:04:54 2019 -0400

    detection: fix creation of service map to use ips policy id
---

diff --git a/src/detection/service_map.cc b/src/detection/service_map.cc
index 2b61a5407..5795b70b3 100644
--- a/src/detection/service_map.cc
+++ b/src/detection/service_map.cc
@@ -248,7 +248,7 @@ int fpCreateServiceMaps(SnortConfig* sc)
             policyId < otn->proto_node_num;
             policyId++ )
         {
-            rtn = getRtnFromOtn(otn);
+            rtn = getRtnFromOtn(otn, policyId);
 
             if ( rtn )
             {