From: Shravan Rangarajuvenkata (shrarang) <shrarang@cisco.com>
Date: Fri, 18 Oct 2019 16:25:21 +0000 (-0400)
Subject: Merge pull request #1803 in SNORT/snort3 from ~SATHIRKA/snort3:userappid_conf to... 
X-Git-Tag: 3.0.0-263~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8713ae78e5291e307f4e99c48e0243e40cfab7a2;p=thirdparty%2Fsnort3.git

Merge pull request #1803 in SNORT/snort3 from ~SATHIRKA/snort3:userappid_conf to master

Squashed commit of the following:

commit cdab8058b0bd8ef59923dc978d09e279e5f0b8bc
Author: Sreeja Athirkandathil Narayanan <sathirka@cisco.com>
Date:   Wed Oct 16 11:37:05 2019 -0400

    appid: Updating the path to userappid.conf
---

diff --git a/src/network_inspectors/appid/app_info_table.cc b/src/network_inspectors/appid/app_info_table.cc
index f85f6d33b..ec847f556 100644
--- a/src/network_inspectors/appid/app_info_table.cc
+++ b/src/network_inspectors/appid/app_info_table.cc
@@ -27,6 +27,7 @@
 
 #include <climits>
 #include <string>
+#include <unistd.h>
 
 #include "appid_api.h"
 #include "appid_config.h"
@@ -660,6 +661,9 @@ void AppInfoManager::init_appid_info_table(AppIdModuleConfig* mod_config,
         load_appid_config (mod_config, filepath);
         snprintf(filepath, sizeof(filepath), "%s/custom/%s", mod_config->app_detector_dir,
             USR_CONFIG_FILE);
+        if (access (filepath, F_OK))
+            snprintf(filepath, sizeof(filepath), "%s/../%s", mod_config->app_detector_dir,
+                USR_CONFIG_FILE);
         load_appid_config (mod_config, filepath);
     }
 }