X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd.socket.xml;h=ce04b0b4c613932637c8b0706a611b929203005f;hb=43b133b4e09a0e991ba1680b9ef5458b24f9dcc9;hp=f376f725c9afbbdfa58158f318357f83fea32d34;hpb=cf8bd44339b00330fdbc91041d6731ba8aba9fec;p=elogind.git
diff --git a/man/systemd.socket.xml b/man/systemd.socket.xml
index f376f725c..ce04b0b4c 100644
--- a/man/systemd.socket.xml
+++ b/man/systemd.socket.xml
@@ -488,7 +488,7 @@
- KeepAliveTime=
+ KeepAliveTimeSec=
Takes time (in seconds) as argument . The connection needs to remain
idle before TCP starts sending keepalive probes. This controls the TCP_KEEPIDLE
socket option (see
@@ -500,7 +500,7 @@
- KeepAliveInterval=
+ KeepAliveIntervalSec=
Takes time (in seconds) as argument between individual keepalive probes,
if the socket option SO_KEEPALIVE has been set on this socket seconds as argument.
This controls the TCP_KEEPINTVL socket option (see
@@ -513,7 +513,7 @@
KeepAliveProbes=
- Takes interger as argument. It's the number of unacknowledged probes to
+ Takes integer as argument. It's the number of unacknowledged probes to
send before considering the connection dead and notifying the application layer.
This controls the TCP_KEEPCNT socket option (see
socket7
@@ -546,7 +546,7 @@
- DeferAccept=
+ DeferAcceptSec=
Takes time (in
seconds) as argument. If set, the
@@ -676,14 +676,29 @@
- SELinuxLabelViaNet=
- Takes a boolean
- value. Controls whether systemd attempts to figure out
- SELinux label used for instantiated service from
- information handed by peer over the
- network. Configuration option has effect only
- on sockets with Accept=
- mode set to yes.
+ SELinuxContextFromNet=
+ Takes a boolean
+ argument. When true systemd will attempt
+ to figure out the SELinux label used
+ for the instantiated service from the
+ information handed by the peer over the
+ network. Note that only the security
+ level is used from the information
+ provided by the peer. Other parts of
+ the resulting SELinux context originate
+ from either the target binary that is
+ effectively triggered by socket unit
+ are taken from the value of the
+ SELinuxContext=
+ option.This configuration option only
+ affects sockets with
+ Accept= mode set to
+ true. Also note that
+ this option is useful only when
+ MLS/MCS SELinux policy is
+ deployed. Defaults to
+ false.
+
@@ -831,7 +846,7 @@
20s". Pass 0 to disable the timeout
logic. Defaults to DefaultTimeoutStartSec= from the
manager configuration file
- (see systemd-systemd.conf5).
+ (see systemd-system.conf5).
@@ -900,7 +915,7 @@
See Also
systemd1,
- systemctl8,
+ systemctl1,
systemd.unit5,
systemd.exec5,
systemd.kill5,