X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd.socket.xml;h=dc0d78f0a208527dee9acdd697d8f74a9c91d3e4;hb=aea54018a5e66a41318afb6c6be745b6aef48d9e;hp=9db39b1de9d0921359d4d75860124d4ed97f2316;hpb=16dad32e437fdf2ffca03cc60a083d84bd31886f;p=elogind.git

diff --git a/man/systemd.socket.xml b/man/systemd.socket.xml
index 9db39b1de..dc0d78f0a 100644
--- a/man/systemd.socket.xml
+++ b/man/systemd.socket.xml
@@ -336,7 +336,7 @@
                         <varlistentry>
                                 <term><varname>DirectoryMode=</varname></term>
                                 <listitem><para>If listening on a file
-                                system socket of FIFO, the parent
+                                system socket or FIFO, the parent
                                 directories are automatically created
                                 if needed. This option specifies the
                                 file system access mode used when
@@ -349,7 +349,7 @@
                         <varlistentry>
                                 <term><varname>SocketMode=</varname></term>
                                 <listitem><para>If listening on a file
-                                system socket of FIFO, this option
+                                system socket or FIFO, this option
                                 specifies the file system access mode
                                 used when creating the file
                                 node. Takes an access mode in octal
@@ -357,6 +357,30 @@
                                 0666.</para></listitem>
                         </varlistentry>
 
+                        <varlistentry>
+                                <term><varname>SocketUser=</varname></term>
+                                <listitem><para>If listening on a file system
+                                socket or FIFO, this option specifies the
+                                user owner of the created socket. When
+                                defining this, keep in mind that name
+                                switch services for user name lookups may
+                                not be available. It is advisable to use a
+                                numeric UID for this
+                                setting.</para></listitem>
+                        </varlistentry>
+
+                        <varlistentry>
+                                <term><varname>SocketGroup=</varname></term>
+                                <listitem><para>If listening on a file system
+                                socket or FIFO, this option specifies the
+                                group owner of the created socket. When
+                                defining this, keep in mind that name
+                                switch services for group name lookups may
+                                not be available. It is advisable to use a
+                                numeric GID for this
+                                setting.</para></listitem>
+                        </varlistentry>
+
                         <varlistentry>
                                 <term><varname>Accept=</varname></term>
                                 <listitem><para>Takes a boolean
@@ -395,7 +419,7 @@
                                 until at least one existing connection
                                 is terminated. This setting has no
                                 effect for sockets configured with
-                                <option>Accept=no</option> or datagram
+                                <option>Accept=false</option> or datagram
                                 sockets. Defaults to
                                 64.</para></listitem>
                         </varlistentry>
@@ -484,6 +508,26 @@
                                 for details.</para></listitem>
                         </varlistentry>
 
+                        <varlistentry>
+                                <term><varname>SmackLabel=</varname></term>
+                                <term><varname>SmackLabelIPIn=</varname></term>
+                                <term><varname>SmackLabelIPOut=</varname></term>
+                                <listitem><para>Takes a string
+                                value. Controls the extended
+                                attributes
+                                <literal>security.SMACK64</literal>,
+                                <literal>security.SMACK64IPIN</literal>
+                                and
+                                <literal>security.SMACK64IPOUT</literal>,
+                                respectively, i.e. the security label
+                                of the FIFO, or the security label for
+                                the incoming or outgoing connections
+                                of the socket, respectively.  See
+                                <ulink
+                                url="https://www.kernel.org/doc/Documentation/security/Smack.txt">Smack.txt</ulink>
+                                for details.</para></listitem>
+                        </varlistentry>
+
                         <varlistentry>
                                 <term><varname>PipeSize=</varname></term>
                                 <listitem><para>Takes an integer