From f7c7a30db9a781e1cc01b78de742d8e622e4aaf9 Mon Sep 17 00:00:00 2001
From: Felipe Zimmerle <fcosta@trustwave.com>
Date: Wed, 11 Feb 2015 18:47:08 -0800
Subject: [PATCH] Uses our own version of ap_find_command

Keep compatibility among different versions of Apache is not a simple
task, in this case it can be avoided by the creation of our own version
of ap_find_command, that is now used by msc_remote_rules.
---
 apache2/msc_remote_rules.c | 36 +++++++++++++++++++++++++++++++++---
 1 file changed, 33 insertions(+), 3 deletions(-)

diff --git a/apache2/msc_remote_rules.c b/apache2/msc_remote_rules.c
index 9f4baa42..8a6df9e0 100644
--- a/apache2/msc_remote_rules.c
+++ b/apache2/msc_remote_rules.c
@@ -34,6 +34,35 @@
 #define AP_MAX_ARGC 64
 #endif
 
+/**
+ * @brief Find command in a list.
+ *
+ * This is a duplicate of `ap_find_command', which is part of the standalone module.
+ * Apache versions does not include the standalone, thus, this is necessary for
+ * the Apache versions. Once it is here it may not be necessary to be part of
+ * the standalone module, but, for this version both function will co-exist
+ * avoiding problems with 3rd parties that are extending the standalone module.
+ *
+ * @note Prefer this function instead of `ap_finc_command` which is part of the
+ *       standalone module.
+ *
+ * @param parms char pointer, function name.
+ * @param cmds pointer to command_rec[].
+ * @retval NULL if command was not found.
+ *
+ */
+const command_rec *msc_remote_find_command(const char *name, const command_rec *cmds)
+{
+    while (cmds->name) {
+        if (!strcasecmp(name, cmds->name))
+            return cmds;
+
+        ++cmds;
+    }
+
+    return NULL;
+}
+
 
 /**
  * @brief Insert a new SecRule to be processed by ModSecurity
@@ -686,9 +715,10 @@ int msc_remote_add_rules_from_uri(cmd_parms *orig_parms,
         {
             const char *rule = NULL;
             int tmp = len;
-            char *cmd_name;
-            char *word;
+            char *cmd_name = NULL;
+            char *word = NULL;
             const command_rec *cmd;
+
             ap_directive_t *newdir;
             cmd_parms *parms = apr_pcalloc(mp, sizeof (cmd_parms));
 
@@ -704,7 +734,7 @@ int msc_remote_add_rules_from_uri(cmd_parms *orig_parms,
             }
 
             cmd_name = ap_getword_conf(mp, &rule);
-            cmd = ap_find_command(cmd_name, security2_module.cmds);
+            cmd = msc_remote_find_command(cmd_name, security2_module.cmds);
 
             if (cmd == NULL)
             {