summaryrefslogtreecommitdiff
path: root/docs-xml
diff options
context:
space:
mode:
authorMartin Schwenke <martin@meltin.net>2021-10-31 11:59:30 +1100
committerRalph Boehme <slow@samba.org>2021-11-01 07:29:47 +0000
commit494eb0c22a67f0a9672a53f8941ad6fecf291a77 (patch)
tree3a3921adbc667b7b0d34d23c0a3cc22f3afa3439 /docs-xml
parent5e1e9d74ab6f59a62ac8dae3239299a0ef334708 (diff)
downloadsamba-494eb0c22a67f0a9672a53f8941ad6fecf291a77.tar.gz
debug: Add new smb.conf option "debug syslog format"
Signed-off-by: Martin Schwenke <martin@meltin.net> Reviewed-by: Ralph Boehme <slow@samba.org> Autobuild-User(master): Ralph Böhme <slow@samba.org> Autobuild-Date(master): Mon Nov 1 07:29:47 UTC 2021 on sn-devel-184
Diffstat (limited to 'docs-xml')
-rw-r--r--docs-xml/smbdotconf/logging/debughirestimestamp.xml3
-rw-r--r--docs-xml/smbdotconf/logging/debugsyslogformat.xml21
2 files changed, 23 insertions, 1 deletions
diff --git a/docs-xml/smbdotconf/logging/debughirestimestamp.xml b/docs-xml/smbdotconf/logging/debughirestimestamp.xml
index 72598d757ca..79d928ab3d9 100644
--- a/docs-xml/smbdotconf/logging/debughirestimestamp.xml
+++ b/docs-xml/smbdotconf/logging/debughirestimestamp.xml
@@ -9,7 +9,8 @@
</para>
<para>
- Note that the parameter <smbconfoption name="debug timestamp"/> must be on for this to have an effect.
+ 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>
diff --git a/docs-xml/smbdotconf/logging/debugsyslogformat.xml b/docs-xml/smbdotconf/logging/debugsyslogformat.xml
new file mode 100644
index 00000000000..f943f3a5323
--- /dev/null
+++ b/docs-xml/smbdotconf/logging/debugsyslogformat.xml
@@ -0,0 +1,21 @@
+<samba:parameter name="debug syslog format"
+ context="G"
+ type="boolean"
+ xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+<description>
+ <para>
+ With this option enabled, 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>
+ 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>