On 16 February 2016 at 20:09, 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.
>
> Signed-off-by: Pablo Neira Ayuso <pablo@xxxxxxxxxxxxx>
> ---
> 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 | 4 ++--
> 6 files changed, 12 insertions(+), 12 deletions(-)
>
[...]
> diff --git a/src/read_config_yy.y b/src/read_config_yy.y
> index 58ad2d0..6052390 100644
> --- a/src/read_config_yy.y
> +++ b/src/read_config_yy.y
> @@ -1864,8 +1864,8 @@ init_config(char *filename)
> CONFIG(stats).syslog_facility = -1;
> CONFIG(netlink).subsys_id = -1;
>
> - /* enable systemd by default */
> - CONFIG(systemd) = 1;
> + /* disable systemd by default */
> + CONFIG(systemd) = 0;
>
> /* Initialize list of user-space helpers */
> INIT_LIST_HEAD(&CONFIG(cthelper).list);
If we change this logic, there are a parser rules that need changes as well.
[...]
systemd: T_SYSTEMD T_ON { /* already enabled in init_config() */ };
systemd: T_SYSTEMD T_OFF
{
conf.systemd = 0;
};
[...]
I agree with the patch, so
Acked-by: Arturo Borrero Gonzalez <arturo.borrero.glez@xxxxxxxxx>
--
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
