netfilter-devel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH conntrack-tools] conntrackd: Don't hardcode libs dir path
@ 2013-10-14 22:14 Hani Benhabiles
  2013-10-15  8:56 ` Pablo Neira Ayuso
  0 siblings, 1 reply; 2+ messages in thread
From: Hani Benhabiles @ 2013-10-14 22:14 UTC (permalink / raw)
  To: netfilter-devel

Use CONNTRACKD_LIB_DIR instead of hardcoded path.

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

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);


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH conntrack-tools] conntrackd: Don't hardcode libs dir path
  2013-10-14 22:14 [PATCH conntrack-tools] conntrackd: Don't hardcode libs dir path Hani Benhabiles
@ 2013-10-15  8:56 ` Pablo Neira Ayuso
  0 siblings, 0 replies; 2+ messages in thread
From: Pablo Neira Ayuso @ 2013-10-15  8:56 UTC (permalink / raw)
  To: Hani Benhabiles; +Cc: netfilter-devel

On Mon, Oct 14, 2013 at 11:14:24PM +0100, Hani Benhabiles wrote:
> Use CONNTRACKD_LIB_DIR instead of hardcoded path.

Applied, thanks.

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2013-10-15  8:56 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-10-14 22:14 [PATCH conntrack-tools] conntrackd: Don't hardcode libs dir path Hani Benhabiles
2013-10-15  8:56 ` Pablo Neira Ayuso

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).