netfilter-devel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Pablo Neira Ayuso <pablo@netfilter.org>
To: Arturo Borrero Gonzalez <arturo.borrero.glez@gmail.com>
Cc: Netfilter Development Mailing list <netfilter-devel@vger.kernel.org>
Subject: Re: [PATCH conntrackd] conntrackd: Disable systemd support by default
Date: Wed, 17 Feb 2016 12:06:02 +0100	[thread overview]
Message-ID: <20160217110602.GA2379@salvia> (raw)
In-Reply-To: <CAOkSjBgUyOd65kZZqg1JZDS1VbDk7mfixLghvMjdDofDsbHTuw@mail.gmail.com>

On Wed, Feb 17, 2016 at 08:50:26AM +0100, Arturo Borrero Gonzalez wrote:
> On 16 February 2016 at 20:09, Pablo Neira Ayuso <pablo@netfilter.org> 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@netfilter.org>
> > ---
> >  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'll fix this, we should anyway explicitly set on/off this based on
what the parser sees, ie.

systemd: T_SYSTEMD T_ON { conf.systemd = 1; };
systemd: T_SYSTEMD T_OFF { conf.systemd = 0; };

And remove the default setting to zero, it's not required.

> [...]
> 
> I agree with the patch, so
> 
> Acked-by: Arturo Borrero Gonzalez <arturo.borrero.glez@gmail.com>

Will send a v2 including this. Thanks.

      reply	other threads:[~2016-02-17 11:06 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-02-16 19:09 [PATCH conntrackd] conntrackd: Disable systemd support by default Pablo Neira Ayuso
2016-02-17  7:50 ` Arturo Borrero Gonzalez
2016-02-17 11:06   ` Pablo Neira Ayuso [this message]

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=20160217110602.GA2379@salvia \
    --to=pablo@netfilter.org \
    --cc=arturo.borrero.glez@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).