[conntrack-tools] systemd: default to use libsystemd if build with support for it

Message ID 152389824276.32583.7500446628583980403.stgit@endurance
State Accepted
Delegated to: Pablo Neira
Headers show
Series
  • [conntrack-tools] systemd: default to use libsystemd if build with support for it
Related show

Commit Message

Arturo Borrero Gonzalez April 16, 2018, 5:04 p.m.
We may assume that if an user does build conntrackd with such feature, is with
the intention to use it. So, if that's the case, default to use it.

This eases some downstream use cases when dealing with default configs to
be shipped to final users.

This could be a mid-point solution, given some users are asking for a full
revert of commit c01d0d9138112ec95ee316385ea2687dd94fa4e3.

Signed-off-by: Arturo Borrero Gonzalez <arturo@netfilter.org>
---
 src/read_config_yy.y |    4 ++++
 1 file changed, 4 insertions(+)


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

Patch

diff --git a/src/read_config_yy.y b/src/read_config_yy.y
index 32cca3c..6de8c6c 100644
--- a/src/read_config_yy.y
+++ b/src/read_config_yy.y
@@ -1626,6 +1626,10 @@  init_config(char *filename)
 	CONFIG(stats).syslog_facility = -1;
 	CONFIG(netlink).subsys_id = -1;
 
+#ifdef BUILD_SYSTEMD
+        CONFIG(systemd) = 1;
+#endif /* BUILD_SYSTEMD */
+
 	/* Initialize list of user-space helpers */
 	INIT_LIST_HEAD(&CONFIG(cthelper).list);