Adding upstream version 2:4.20.0+dfsg.upstream/2%4.20.0+dfsg

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

16 files changed, 485 insertions, 0 deletions

diff --git a/docs-xml/smbdotconf/logging/debugclass.xml b/docs-xml/smbdotconf/logging/debugclass.xml
new file mode 100644
index 0000000..eee3cc5
--- /dev/null
+++ b/docs-xml/smbdotconf/logging/debugclass.xml
@@ -0,0 +1,17 @@
+<samba:parameter name="debug class"
+                 context="G"
+                 type="boolean"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+<description>
+    <para>
+    With this boolean parameter enabled, the debug class (DBGC_CLASS) 
+    will be displayed in the debug header.
+    </para>
+    <para>
+    For more information about currently available debug classes, see
+    section about <smbconfoption name="log level"/>.
+    </para>
+
+</description>
+<value type="default">no</value>
+</samba:parameter>
diff --git a/docs-xml/smbdotconf/logging/debughirestimestamp.xml b/docs-xml/smbdotconf/logging/debughirestimestamp.xml
new file mode 100644
index 0000000..79d928a
--- /dev/null
+++ b/docs-xml/smbdotconf/logging/debughirestimestamp.xml
@@ -0,0 +1,18 @@
+<samba:parameter name="debug hires timestamp"
+                 context="G"
+                 type="boolean"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+<description>
+    <para>
+    Sometimes the timestamps in the log messages are needed with a resolution of higher that seconds, this 
+    boolean parameter adds microsecond resolution to the timestamp  message header when turned on.
+    </para>
+
+    <para>
+    Note that the parameter <smbconfoption name="debug timestamp"/> or
+    <smbconfoption name="debug syslog format"/> must be on for this to have an effect.
+    </para>
+
+</description>
+<value type="default">yes</value>
+</samba:parameter>
diff --git a/docs-xml/smbdotconf/logging/debugpid.xml b/docs-xml/smbdotconf/logging/debugpid.xml
new file mode 100644
index 0000000..8e6436c
--- /dev/null
+++ b/docs-xml/smbdotconf/logging/debugpid.xml
@@ -0,0 +1,18 @@
+<samba:parameter name="debug pid"
+                 context="G"
+                 type="boolean"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+<description>
+    <para>
+    When using only one log file for more then one forked <citerefentry><refentrytitle>smbd</refentrytitle>
+    <manvolnum>8</manvolnum></citerefentry>-process there may be hard to follow which process outputs which 
+    message. This boolean parameter is adds the process-id to the timestamp message headers in the
+    logfile when turned on.
+    </para>
+
+    <para>
+    Note that the parameter <smbconfoption name="debug timestamp"/> must be on for this to have an effect.
+    </para>
+</description>
+<value type="default">no</value>
+</samba:parameter>
diff --git a/docs-xml/smbdotconf/logging/debugprefixtimestamp.xml b/docs-xml/smbdotconf/logging/debugprefixtimestamp.xml
new file mode 100644
index 0000000..0a004d4
--- /dev/null
+++ b/docs-xml/smbdotconf/logging/debugprefixtimestamp.xml
@@ -0,0 +1,18 @@
+<samba:parameter name="debug prefix timestamp"
+                 context="G"
+                 type="boolean"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+<description>
+    <para>
+    With this option enabled, the timestamp message header is prefixed to the debug message without the
+    filename and function information that is included with the <smbconfoption name="debug timestamp"/> 
+    parameter. This gives timestamps to the messages without adding an additional line.
+    </para>
+
+    <para>
+    Note that this parameter overrides the <smbconfoption name="debug timestamp"/> parameter.
+    </para>
+
+</description>
+<value type="default">no</value>
+</samba:parameter>
diff --git a/docs-xml/smbdotconf/logging/debugsyslogformat.xml b/docs-xml/smbdotconf/logging/debugsyslogformat.xml
new file mode 100644
index 0000000..ee1627d
--- /dev/null
+++ b/docs-xml/smbdotconf/logging/debugsyslogformat.xml
@@ -0,0 +1,33 @@
+<samba:parameter name="debug syslog format"
+                 context="G"
+                 type="enum"
+                 enumlist="enum_debug_syslog_format"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+<description>
+    <para>
+    With this option enabled (<constant>yes</constant> (alias
+    <constant>in_logs</constant>) or
+    <constant>always</constant>), debug messages are printed in a
+    single-line format like that traditionally produced by syslog.
+    The timestamp consists of an abbreviated month, space-padded date,
+    and time including seconds.  This is followed by the hostname and
+    the program name, with the process-ID in square brackets.
+    </para>
+
+    <para>The value <constant>always</constant> produces this log
+    format even to <constant>STDOUT</constant> or
+    <constant>STDERR</constant>
+    </para>
+
+    <para>The value <constant>no</constant> defers to other parameters
+    and typically produces traditional two-line Samba logs to log files.
+    </para>
+
+    <para>
+    If <smbconfoption name="debug hires timestamp"/> is also enabled
+    then an RFC5424 timestamp is used instead.
+    </para>
+
+</description>
+<value type="default">no</value>
+</samba:parameter>
diff --git a/docs-xml/smbdotconf/logging/debugtraceid.xml b/docs-xml/smbdotconf/logging/debugtraceid.xml
new file mode 100644
index 0000000..61a451d
--- /dev/null
+++ b/docs-xml/smbdotconf/logging/debugtraceid.xml
@@ -0,0 +1,13 @@
+<samba:parameter name="winbind debug traceid"
+                 context="G"
+                 type="boolean"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+<description>
+    <para>
+    With this boolean parameter enabled, the per request unique traceid
+    will be displayed in the debug header for winbind processes.
+    </para>
+
+</description>
+<value type="default">no</value>
+</samba:parameter>
diff --git a/docs-xml/smbdotconf/logging/debuguid.xml b/docs-xml/smbdotconf/logging/debuguid.xml
new file mode 100644
index 0000000..1dd1dbf
--- /dev/null
+++ b/docs-xml/smbdotconf/logging/debuguid.xml
@@ -0,0 +1,16 @@
+<samba:parameter name="debug uid"
+                 context="G"
+                 type="boolean"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+<description>
+    <para>
+    Samba is sometimes run as root and sometime run as the connected user, this boolean parameter inserts the 
+    current euid, egid, uid and gid to the timestamp message headers in the log file if turned on.
+    </para>
+		
+    <para>
+    Note that the parameter <smbconfoption name="debug timestamp"/> must be on for this to have an effect.
+    </para>
+</description>
+<value type="default">no</value>
+</samba:parameter>
diff --git a/docs-xml/smbdotconf/logging/ldapdebuglevel.xml b/docs-xml/smbdotconf/logging/ldapdebuglevel.xml
new file mode 100644
index 0000000..2092b7d
--- /dev/null
+++ b/docs-xml/smbdotconf/logging/ldapdebuglevel.xml
@@ -0,0 +1,28 @@
+<samba:parameter name="ldap debug level"
+                 type="integer"
+                 context="G"
+                 handler="handle_ldap_debug_level"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+<description>
+	<para>
+		This parameter controls the debug level of the LDAP library
+		calls. In the case of OpenLDAP, it is the same
+		bit-field as understood by the server and documented in the
+		 <citerefentry>
+			<refentrytitle>slapd.conf</refentrytitle>
+			<manvolnum>5</manvolnum>
+		</citerefentry>
+		manpage.
+		A typical useful value will be
+		 <emphasis>1</emphasis> for tracing function calls.
+	</para>
+	<para>
+		The debug output from the LDAP libraries appears with the
+		prefix [LDAP] in Samba's logging output.
+		The level at which LDAP logging is printed is controlled by the
+		parameter <parameter>ldap debug threshold</parameter>.
+	</para>
+</description>
+<value type="default">0</value>
+<value type="example">1</value>
+</samba:parameter>
diff --git a/docs-xml/smbdotconf/logging/ldapdebugthreshold.xml b/docs-xml/smbdotconf/logging/ldapdebugthreshold.xml
new file mode 100644
index 0000000..2783ac9
--- /dev/null
+++ b/docs-xml/smbdotconf/logging/ldapdebugthreshold.xml
@@ -0,0 +1,15 @@
+<samba:parameter name="ldap debug threshold"
+                 type="integer"
+                 context="G"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+<description>
+	<para>
+		This parameter controls the Samba debug level at which
+		the ldap library debug output is
+		printed in the Samba logs. See the description of
+		 <parameter>ldap debug level</parameter> for details.
+	</para>
+</description>
+<value type="default">10</value>
+<value type="example">5</value>
+</samba:parameter>
diff --git a/docs-xml/smbdotconf/logging/logfile.xml b/docs-xml/smbdotconf/logging/logfile.xml
new file mode 100644
index 0000000..07762ee
--- /dev/null
+++ b/docs-xml/smbdotconf/logging/logfile.xml
@@ -0,0 +1,18 @@
+<samba:parameter name="log file"
+                 context="G"
+                 type="string"
+                 function="logfile"
+                 handler="handle_logfile"
+                 substitution="1"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+<description>
+    <para>
+    This option allows you to override the name of the Samba log file (also known as the debug file).
+    </para>
+
+    <para>
+    This option takes the standard substitutions, allowing you to have separate log files for each user or machine.
+    </para>
+</description>
+<value type="example">/usr/local/samba/var/log.%m</value>
+</samba:parameter>
diff --git a/docs-xml/smbdotconf/logging/logging.xml b/docs-xml/smbdotconf/logging/logging.xml
new file mode 100644
index 0000000..0ab2c1f
--- /dev/null
+++ b/docs-xml/smbdotconf/logging/logging.xml
@@ -0,0 +1,45 @@
+<samba:parameter name="logging"
+                 type="string"
+                 context="G"
+                 substitution="1"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+<description>
+
+  <para>This parameter configures logging backends. Multiple
+    backends can be specified at the same time, with different log
+    levels for each backend. The parameter is a list of backends,
+    where each backend is specified as backend[:option][@loglevel].</para>
+
+  <para>The 'option' parameter can be used to pass backend-specific
+    options.</para>
+
+  <para>The log level for a backend is optional, if it is not set for
+    a backend, all messages are sent to this backend. The parameter
+    <smbconfoption name="log level"/> determines overall log levels,
+    while the log levels specified here define what is sent to the
+    individual backends.</para>
+
+  <para>When <smbconfoption name="logging"/> is set, it overrides the
+    <smbconfoption  name="syslog"/>  and  <smbconfoption  name="syslog
+    only"/> parameters.</para>
+
+  <para>Some backends are only available when Samba has been compiled
+  with the additional libraries. The overall list of logging backends:</para>
+
+  <itemizedlist>
+    <listitem><para><parameter moreinfo="none">syslog</parameter></para></listitem>
+    <listitem><para><parameter moreinfo="none">file</parameter></para></listitem>
+    <listitem><para><parameter moreinfo="none">systemd</parameter></para></listitem>
+    <listitem><para><parameter moreinfo="none">lttng</parameter></para></listitem>
+    <listitem><para><parameter moreinfo="none">gpfs</parameter></para></listitem>
+    <listitem><para><parameter moreinfo="none">ringbuf</parameter></para></listitem>
+  </itemizedlist>
+
+  <para>The <parameter moreinfo="none">ringbuf</parameter> backend supports an
+  optional size argument to change the buffer size used, the default is 1 MB:
+  <parameter moreinfo="none">ringbuf:size=NBYTES</parameter></para>
+
+</description>
+<value type="default"></value>
+<value type="example">syslog@1 file</value>
+</samba:parameter>
diff --git a/docs-xml/smbdotconf/logging/loglevel.xml b/docs-xml/smbdotconf/logging/loglevel.xml
new file mode 100644
index 0000000..434c5d0
--- /dev/null
+++ b/docs-xml/smbdotconf/logging/loglevel.xml
@@ -0,0 +1,171 @@
+<samba:parameter name="log level"
+                 type="string"
+                 context="G"
+                 handler="handle_debug_list"
+                 substitution="1"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+<synonym>debuglevel</synonym>
+<description>
+    <para>
+    The value of the parameter (a string) allows the debug level (logging level) to be specified in the
+    <filename moreinfo="none">smb.conf</filename> file. 
+    </para>
+
+    <para>This parameter has been extended since the 2.2.x 
+    series, now it allows one to specify the debug level for multiple 
+    debug classes and distinct logfiles for debug classes. This is to give
+    greater flexibility in the configuration of the system. The following
+    debug classes are currently implemented:
+    </para>
+
+    <itemizedlist>
+	<listitem><para><parameter moreinfo="none">all</parameter></para></listitem>
+	<listitem><para><parameter moreinfo="none">tdb</parameter></para></listitem>
+	<listitem><para><parameter moreinfo="none">printdrivers</parameter></para></listitem>
+	<listitem><para><parameter moreinfo="none">lanman</parameter></para></listitem>
+	<listitem><para><parameter moreinfo="none">smb</parameter></para></listitem>
+	<listitem><para><parameter moreinfo="none">rpc_parse</parameter></para></listitem>
+	<listitem><para><parameter moreinfo="none">rpc_srv</parameter></para></listitem>
+	<listitem><para><parameter moreinfo="none">rpc_cli</parameter></para></listitem>
+	<listitem><para><parameter moreinfo="none">passdb</parameter></para></listitem>
+	<listitem><para><parameter moreinfo="none">sam</parameter></para></listitem>
+	<listitem><para><parameter moreinfo="none">auth</parameter></para></listitem>
+	<listitem><para><parameter moreinfo="none">winbind</parameter></para></listitem>
+	<listitem><para><parameter moreinfo="none">vfs</parameter></para></listitem>
+	<listitem><para><parameter moreinfo="none">idmap</parameter></para></listitem>
+	<listitem><para><parameter moreinfo="none">quota</parameter></para></listitem>
+	<listitem><para><parameter moreinfo="none">acls</parameter></para></listitem>
+	<listitem><para><parameter moreinfo="none">locking</parameter></para></listitem>
+	<listitem><para><parameter moreinfo="none">msdfs</parameter></para></listitem>
+	<listitem><para><parameter moreinfo="none">dmapi</parameter></para></listitem>
+	<listitem><para><parameter moreinfo="none">registry</parameter></para></listitem>
+	<listitem><para><parameter moreinfo="none">scavenger</parameter></para></listitem>
+	<listitem><para><parameter moreinfo="none">dns</parameter></para></listitem>
+	<listitem><para><parameter moreinfo="none">ldb</parameter></para></listitem>
+	<listitem><para><parameter moreinfo="none">tevent</parameter></para></listitem>
+	<listitem><para><parameter moreinfo="none">auth_audit</parameter></para></listitem>
+	<listitem><para><parameter moreinfo="none">auth_json_audit</parameter></para></listitem>
+	<listitem><para><parameter moreinfo="none">kerberos</parameter></para></listitem>
+	<listitem><para><parameter moreinfo="none">drs_repl</parameter></para></listitem>
+	<listitem><para><parameter moreinfo="none">smb2</parameter></para></listitem>
+	<listitem><para><parameter moreinfo="none">smb2_credits</parameter></para></listitem>
+	<listitem><para><parameter moreinfo="none">dsdb_audit</parameter></para></listitem>
+	<listitem><para><parameter moreinfo="none">dsdb_json_audit</parameter></para></listitem>
+	<listitem><para><parameter moreinfo="none">dsdb_password_audit</parameter></para></listitem>
+	<listitem><para><parameter moreinfo="none">dsdb_password_json_audit</parameter></para></listitem>
+	<listitem><para><parameter moreinfo="none">dsdb_transaction_audit</parameter></para></listitem>
+	<listitem><para><parameter moreinfo="none">dsdb_transaction_json_audit</parameter></para></listitem>
+	<listitem><para><parameter moreinfo="none">dsdb_group_audit</parameter></para></listitem>
+	<listitem><para><parameter moreinfo="none">dsdb_group_json_audit</parameter></para></listitem>
+    </itemizedlist>
+
+    <para>Various modules register dynamic debug classes at first usage:</para>
+    <itemizedlist>
+	<listitem><para><parameter moreinfo="none">catia</parameter></para></listitem>
+	<listitem><para><parameter moreinfo="none">dfs_samba4</parameter></para></listitem>
+	<listitem><para><parameter moreinfo="none">extd_audit</parameter></para></listitem>
+	<listitem><para><parameter moreinfo="none">fileid</parameter></para></listitem>
+	<listitem><para><parameter moreinfo="none">fruit</parameter></para></listitem>
+	<listitem><para><parameter moreinfo="none">full_audit</parameter></para></listitem>
+	<listitem><para><parameter moreinfo="none">media_harmony</parameter></para></listitem>
+	<listitem><para><parameter moreinfo="none">preopen</parameter></para></listitem>
+	<listitem><para><parameter moreinfo="none">recycle</parameter></para></listitem>
+	<listitem><para><parameter moreinfo="none">shadow_copy</parameter></para></listitem>
+	<listitem><para><parameter moreinfo="none">shadow_copy</parameter></para></listitem>
+	<listitem><para><parameter moreinfo="none">unityed_media</parameter></para></listitem>
+	<listitem><para><parameter moreinfo="none">virusfilter</parameter></para></listitem>
+    </itemizedlist>
+
+    <para>To configure the logging for specific classes to go into a different
+    file then <smbconfoption name="log file"/>, you can append
+    <emphasis>@PATH</emphasis> to the class, eg <parameter>log level = 1
+    full_audit:1@/var/log/audit.log</parameter>.</para>
+
+    <para>Authentication and authorization audit information is logged
+    under the <parameter>auth_audit</parameter>, and if Samba was not compiled with
+    --without-json, a JSON representation is logged under
+    <parameter>auth_json_audit</parameter>.</para>
+
+    <para>Support is comprehensive for all authentication and authorisation
+    of user accounts in the Samba Active Directory Domain Controller,
+    as well as the implicit authentication in password changes.  In
+    the file server, NTLM authentication, SMB and RPC authorization is
+    covered.</para>
+
+    <para>Log levels for <parameter>auth_audit</parameter> and
+    <parameter>auth_audit_json</parameter> are:</para>
+    <itemizedlist>
+	<listitem><para>2: Authentication Failure</para></listitem>
+	<listitem><para>3: Authentication Success</para></listitem>
+	<listitem><para>4: Authorization Success</para></listitem>
+	<listitem><para>5: Anonymous Authentication and Authorization Success</para></listitem>
+    </itemizedlist>
+
+    <para>Changes to the AD DC <command moreinfo="none">sam.ldb</command>
+    database are logged under the <parameter>dsdb_audit</parameter>
+    and a JSON representation is logged under
+    <parameter>dsdb_json_audit</parameter>.</para>
+
+    <para>Group membership changes to the AD DC <command
+    moreinfo="none">sam.ldb</command> database are logged under the
+    <parameter>dsdb_group_audit</parameter> and a JSON representation
+    is logged under
+    <parameter>dsdb_group_json_audit</parameter>.</para>
+
+    <para>Log levels for <parameter>dsdb_audit</parameter>,
+    <parameter>dsdb_json_audit</parameter>,
+    <parameter>dsdb_group_audit</parameter>,
+    <parameter>dsdb_group_json_audit</parameter> and
+    <parameter>dsdb_json_audit</parameter> are:</para>
+    <itemizedlist>
+	<listitem><para>5: Database modifications</para></listitem>
+	<listitem><para>5: Replicated updates from another DC</para></listitem>
+    </itemizedlist>
+
+    <para>Password changes and Password resets in the AD DC are logged
+    under <parameter>dsdb_password_audit</parameter> and a JSON
+    representation is logged under the
+    <parameter>dsdb_password_json_audit</parameter>.  Password changes
+    will also appears as authentication events via
+    <parameter>auth_audit</parameter> and
+    <parameter>auth_audit_json</parameter>.</para>
+
+    <para>Log levels for <parameter>dsdb_password_audit</parameter> and
+    <parameter>dsdb_password_json_audit</parameter> are:</para>
+    <itemizedlist>
+	<listitem><para>5: Successful password changes and resets</para></listitem>
+    </itemizedlist>
+
+    <para>Transaction rollbacks and prepare commit failures are logged under
+    the <parameter>dsdb_transaction_audit</parameter> and a JSON representation is logged under the
+    <parameter>dsdb_transaction_json_audit</parameter>. </para>
+
+    <para>Log levels for <parameter>dsdb_transaction_audit</parameter> and
+    <parameter>dsdb_transaction_json</parameter> are:</para>
+
+    <itemizedlist>
+	<listitem><para>5: Transaction failure (rollback)</para></listitem>
+	<listitem><para>10: Transaction success (commit)</para></listitem>
+    </itemizedlist>
+
+    <para>Transaction roll-backs are possible in Samba, and whilst
+    they rarely reflect anything more than the failure of an
+    individual operation (say due to the add of a conflicting record),
+    they are possible.  Audit logs are already generated and sent to
+    the system logs before the transaction is complete.  Logging the
+    transaction details allows the identification of password and
+    <command moreinfo="none">sam.ldb</command> operations that have
+    been rolled back, and so have not actually persisted.</para>
+
+    <warning><para> Changes to <command
+    moreinfo="none">sam.ldb</command> made locally by the <command
+    moreinfo="none">root</command> user with direct access to the
+    database are not logged to the system logs, but to the
+    administrator's own console.  While less than ideal, any user able
+    to make such modifications could disable the audit logging in any
+    case. </para></warning>
+</description>
+<value type="default">0</value>
+<value type="example">3 passdb:5 auth:10 winbind:2</value>
+<value type="example">1 full_audit:1@/var/log/audit.log winbind:2</value>
+</samba:parameter>
diff --git a/docs-xml/smbdotconf/logging/maxlogsize.xml b/docs-xml/smbdotconf/logging/maxlogsize.xml
new file mode 100644
index 0000000..8a1979d
--- /dev/null
+++ b/docs-xml/smbdotconf/logging/maxlogsize.xml
@@ -0,0 +1,17 @@
+<samba:parameter name="max log size"
+                 type="bytes"
+                 context="G"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+<description>
+    <para>
+    This option (an integer in kilobytes) specifies the max size the log file should grow to. 
+    Samba periodically checks the size and if it is exceeded it will rename the file, adding 
+	a <filename moreinfo="none">.old</filename> extension.
+	</para>
+
+	<para>A size of 0 means no limit.
+	</para>
+</description>
+<value type="default">5000</value>
+<value type="example">1000</value>
+</samba:parameter>
diff --git a/docs-xml/smbdotconf/logging/syslog.xml b/docs-xml/smbdotconf/logging/syslog.xml
new file mode 100644
index 0000000..78e694e
--- /dev/null
+++ b/docs-xml/smbdotconf/logging/syslog.xml
@@ -0,0 +1,25 @@
+<samba:parameter name="syslog"
+                 context="G"
+                 type="integer"
+                 deprecated="1"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+<description>
+    <para>
+    This parameter maps how Samba debug messages are logged onto the system syslog logging levels. 
+    Samba debug level zero maps onto syslog <constant>LOG_ERR</constant>, debug level one maps onto 
+    <constant>LOG_WARNING</constant>, debug level two maps onto <constant>LOG_NOTICE</constant>,
+    debug level three maps onto LOG_INFO. All higher levels are mapped to <constant>LOG_DEBUG</constant>.
+    </para>
+
+    <para>
+    This parameter sets the threshold for sending messages to syslog.  Only messages with debug 
+    level less than this value will be sent to syslog. There still will be some
+    logging to log.[sn]mbd even if <emphasis>syslog only</emphasis> is enabled.
+    </para>
+
+    <para>The <smbconfoption name="logging"/> parameter should be used
+      instead. When <smbconfoption name="logging"/> is set, it
+      overrides the <smbconfoption name="syslog"/> parameter.</para>
+</description>
+<value type="default">1</value>
+</samba:parameter>
diff --git a/docs-xml/smbdotconf/logging/syslogonly.xml b/docs-xml/smbdotconf/logging/syslogonly.xml
new file mode 100644
index 0000000..b9aea2d
--- /dev/null
+++ b/docs-xml/smbdotconf/logging/syslogonly.xml
@@ -0,0 +1,19 @@
+<samba:parameter name="syslog only"
+                 context="G"
+                 type="boolean"
+                 deprecated="1"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+<description>
+    <para>
+    If this parameter is set then Samba debug messages are logged into the system 
+    syslog only, and not to the debug log files. There still will be some
+	logging to log.[sn]mbd even if <emphasis>syslog only</emphasis> is enabled.
+    </para>
+
+
+    <para>The <smbconfoption name="logging"/> parameter should be used
+      instead. When <smbconfoption name="logging"/> is set, it
+      overrides the <smbconfoption name="syslog only"/> parameter.</para>
+</description>
+<value type="default">no</value>
+</samba:parameter>
diff --git a/docs-xml/smbdotconf/logging/timestamplogs.xml b/docs-xml/smbdotconf/logging/timestamplogs.xml
new file mode 100644
index 0000000..28003c3
--- /dev/null
+++ b/docs-xml/smbdotconf/logging/timestamplogs.xml
@@ -0,0 +1,14 @@
+<samba:parameter name="timestamp logs"
+                 context="G"
+                 type="boolean"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+<synonym>debug timestamp</synonym>
+<description>
+    <para>
+    Samba debug log messages are timestamped by default. If you are running at a high
+    <smbconfoption name="debug level"/> these timestamps can be distracting. This
+    boolean parameter allows timestamping to be turned off.
+	</para>
+</description>
+<value type="default">yes</value>
+</samba:parameter>