diff options
| author | Pablo Neira Ayuso <pablo@netfilter.org> | 2016-02-16 20:01:52 +0100 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2016-02-17 12:24:03 +0100 |
| commit | c01d0d9138112ec95ee316385ea2687dd94fa4e3 (patch) | |
| tree | 923e9fb879db8d2ebc86d5b20c5d09b860015548 /src/read_config_yy.y | |
| parent | b6b6d4b1ee0af138ad5713d5a5238c9f99905906 (diff) | |
conntrackd: Disable runtime systemd support by default
By default, conntrackd is compiled with no built-in systemd support.
This patch updates the default runtime behaviour to be consistent
with what ./configure provides by default.
Thus, users should explicitly indicate "Systemd On" in their configuration
file to enable this. This shouldn't cause any problem to old users of
conntrackd.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'src/read_config_yy.y')
| -rw-r--r-- | src/read_config_yy.y | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/read_config_yy.y b/src/read_config_yy.y index 58ad2d0..cc0eb18 100644 --- a/src/read_config_yy.y +++ b/src/read_config_yy.y @@ -1126,11 +1126,8 @@ general_line: hashsize | systemd ; -systemd: T_SYSTEMD T_ON { /* already enabled in init_config() */ }; -systemd: T_SYSTEMD T_OFF -{ - conf.systemd = 0; -}; +systemd: T_SYSTEMD T_ON { conf.systemd = 1; }; +systemd: T_SYSTEMD T_OFF { conf.systemd = 0; }; netlink_buffer_size: T_BUFFER_SIZE T_NUMBER { @@ -1864,9 +1861,6 @@ init_config(char *filename) CONFIG(stats).syslog_facility = -1; CONFIG(netlink).subsys_id = -1; - /* enable systemd by default */ - CONFIG(systemd) = 1; - /* Initialize list of user-space helpers */ INIT_LIST_HEAD(&CONFIG(cthelper).list); |