All of lore.kernel.org
 help / color / mirror / Atom feed
From: Hani Benhabiles <kroosec@gmail.com>
To: netfilter-devel@vger.kernel.org
Subject: [PATCH conntrack-tools] conntrackd: Don't hardcode libs dir path
Date: Mon, 14 Oct 2013 23:14:24 +0100	[thread overview]
Message-ID: <20131014221424.GA10577@doj> (raw)

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


             reply	other threads:[~2013-10-14 22:14 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-10-14 22:14 Hani Benhabiles [this message]
2013-10-15  8:56 ` [PATCH conntrack-tools] conntrackd: Don't hardcode libs dir path Pablo Neira Ayuso

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20131014221424.GA10577@doj \
    --to=kroosec@gmail.com \
    --cc=netfilter-devel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.