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: Disable runtime systemd support by default
Date: Thu, 18 Feb 2016 14:07:35 +0100	[thread overview]
Message-ID: <20160218130735.GA2296@salvia> (raw)
In-Reply-To: <CAOkSjBg1cr9tQD_SPhZxN2TBj9z6AfRJB6J5htR3vTdzvaJirg@mail.gmail.com>

On Thu, Feb 18, 2016 at 08:54:16AM +0100, Arturo Borrero Gonzalez wrote:
> On 17 February 2016 at 12:26, 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. This shouldn't cause any problem to old users of
> > conntrackd.
> >
> > Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
> > ---
> > 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.

This is a global variable allocated in the bss, so we can assume this
is always initialized (zero).

      reply	other threads:[~2016-02-18 13:07 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-02-17 11:26 [PATCH] conntrackd: Disable runtime systemd support by default Pablo Neira Ayuso
2016-02-18  7:54 ` Arturo Borrero Gonzalez
2016-02-18 13:07   ` 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=20160218130735.GA2296@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).