diff mbox

[conntrack-tools] conntrackd: Don't hardcode libs dir path

Message ID 20131014221424.GA10577@doj
State Accepted
Headers show

Commit Message

Hani Benhabiles Oct. 14, 2013, 10:14 p.m. UTC 
Use CONNTRACKD_LIB_DIR instead of hardcoded path.

Signed-off-by: Hani Benhabiles <kroosec@gmail.com>
---


--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Pablo Neira Ayuso Oct. 15, 2013, 8:56 a.m. UTC | #1 
On Mon, Oct 14, 2013 at 11:14:24PM +0100, Hani Benhabiles wrote:
> Use CONNTRACKD_LIB_DIR instead of hardcoded path.

Applied, thanks.
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/src/read_config_yy.y b/src/read_config_yy.y
index fa517bb..73fabbf 100644
--- a/src/read_config_yy.y
+++ b/src/read_config_yy.y
@@ -1613,8 +1613,7 @@  helper_type: T_TYPE T_STRING T_STRING T_STRING '{' helper_type_list  '}'
 	}
 
 #ifdef BUILD_CTHELPER
-	/* XXX use configure.ac definitions. */
-	helper = helper_find("/usr/lib/conntrack-tools", $2, l4proto, RTLD_NOW);
+	helper = helper_find(CONNTRACKD_LIB_DIR, $2, l4proto, RTLD_NOW);
 	if (helper == NULL) {
 		print_err(CTD_CFG_ERROR, "Unknown `%s' helper", $2);
 		exit(EXIT_FAILURE);