On 17 February 2016 at 12:26, Pablo Neira Ayuso <pablo@xxxxxxxxxxxxx> wrote:
> 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@xxxxxxxxxxxxx>
> ---
> v2: updates grammar to handle "On" case accordingly.
>
> conntrackd.conf.5 | 4 ++--
> doc/stats/conntrackd.conf | 4 ++--
> doc/sync/alarm/conntrackd.conf | 4 ++--
> doc/sync/ftfw/conntrackd.conf | 4 ++--
> doc/sync/notrack/conntrackd.conf | 4 ++--
> src/read_config_yy.y | 10 ++--------
> 6 files changed, 12 insertions(+), 18 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;
> -
In src/systemd.c we check several times if (CONFIG(systemd) == 0), so
I think the value should be initialized to something.
--
Arturo Borrero González
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
