* [PATCH] conntrackd: Disable runtime systemd support by default
@ 2016-02-17 11:26 Pablo Neira Ayuso
2016-02-18 7:54 ` Arturo Borrero Gonzalez
0 siblings, 1 reply; 3+ messages in thread
From: Pablo Neira Ayuso @ 2016-02-17 11:26 UTC (permalink / raw)
To: netfilter-devel; +Cc: arturo.borrero.glez
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/conntrackd.conf.5 b/conntrackd.conf.5
index 4781825..ed387b9 100644
--- a/conntrackd.conf.5
+++ b/conntrackd.conf.5
@@ -457,9 +457,9 @@ Obviusly, this requires the init systemd of your system to be \fBsystemd(1)\fP.
Note: \fBsystemd(1)\fP watchdog is supported as well.
-Example: Systemd off
+Example: Systemd on
-By default runtime support is activated.
+By default runtime support is disabled.
.TP
.BI "Nice <value>"
diff --git a/doc/stats/conntrackd.conf b/doc/stats/conntrackd.conf
index b1cca07..6a9aec8 100644
--- a/doc/stats/conntrackd.conf
+++ b/doc/stats/conntrackd.conf
@@ -6,9 +6,9 @@ General {
# Enable systemd support. If conntrackd is compiled with the proper
# configuration, you can use a systemd service unit of Type=notify
# and use conntrackd with systemd watchdog as well.
- # Default is: on
+ # Default is: off
#
- #Systemd off
+ #Systemd on
#
# Set the nice value of the daemon. This value goes from -20
diff --git a/doc/sync/alarm/conntrackd.conf b/doc/sync/alarm/conntrackd.conf
index 39deb47..225d1c9 100644
--- a/doc/sync/alarm/conntrackd.conf
+++ b/doc/sync/alarm/conntrackd.conf
@@ -221,9 +221,9 @@ General {
# Enable systemd support. If conntrackd is compiled with the proper
# configuration, you can use a systemd service unit of Type=notify
# and use conntrackd with systemd watchdog as well.
- # Default is: on
+ # Default is: off
#
- #Systemd off
+ #Systemd on
#
# Set the nice value of the daemon, this value goes from -20
diff --git a/doc/sync/ftfw/conntrackd.conf b/doc/sync/ftfw/conntrackd.conf
index 60d7d97..228674c 100644
--- a/doc/sync/ftfw/conntrackd.conf
+++ b/doc/sync/ftfw/conntrackd.conf
@@ -244,9 +244,9 @@ General {
# Enable systemd support. If conntrackd is compiled with the proper
# configuration, you can use a systemd service unit of Type=notify
# and use conntrackd with systemd watchdog as well.
- # Default is: on
+ # Default is: off
#
- #Systemd off
+ #Systemd on
#
# Set the nice value of the daemon, this value goes from -20
diff --git a/doc/sync/notrack/conntrackd.conf b/doc/sync/notrack/conntrackd.conf
index b9d42ba..3becd91 100644
--- a/doc/sync/notrack/conntrackd.conf
+++ b/doc/sync/notrack/conntrackd.conf
@@ -283,9 +283,9 @@ General {
# Enable systemd support. If conntrackd is compiled with the proper
# configuration, you can use a systemd service unit of Type=notify
# and use conntrackd with systemd watchdog as well.
- # Default is: on
+ # Default is: off
#
- #Systemd off
+ #Systemd on
#
# Set the nice value of the daemon, this value goes from -20
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);
--
2.1.4
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] conntrackd: Disable runtime systemd support by default
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
0 siblings, 1 reply; 3+ messages in thread
From: Arturo Borrero Gonzalez @ 2016-02-18 7:54 UTC (permalink / raw)
To: Pablo Neira Ayuso; +Cc: Netfilter Development Mailing list
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.
--
Arturo Borrero González
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] conntrackd: Disable runtime systemd support by default
2016-02-18 7:54 ` Arturo Borrero Gonzalez
@ 2016-02-18 13:07 ` Pablo Neira Ayuso
0 siblings, 0 replies; 3+ messages in thread
From: Pablo Neira Ayuso @ 2016-02-18 13:07 UTC (permalink / raw)
To: Arturo Borrero Gonzalez; +Cc: Netfilter Development Mailing list
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).
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-02-18 13:07 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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 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).