From 0f5e45b84c9b54909294fc0ea48f7b6fb3ca2878 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Fri, 28 Sep 2012 10:58:45 -0700
Subject: smb.conf(5): Add basic documentation for 'tls keyfile'.

---
 docs-xml/smbdotconf/security/tlscafile.xml  |  2 --
 docs-xml/smbdotconf/security/tlskeyfile.xml | 18 ++++++++++++++++++
 2 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 docs-xml/smbdotconf/security/tlskeyfile.xml

(limited to 'docs-xml/smbdotconf/security')

diff --git a/docs-xml/smbdotconf/security/tlscafile.xml b/docs-xml/smbdotconf/security/tlscafile.xml
index 6675ff37b7..ea2a595514 100644
--- a/docs-xml/smbdotconf/security/tlscafile.xml
+++ b/docs-xml/smbdotconf/security/tlscafile.xml
@@ -7,8 +7,6 @@
 	 <para>This option can be set to a file (PEM format)
 		 containing CA certificates of root CAs to trust to sign
 		 certificates or intermediate CA certificates.</para>
-
-	 <para>At the moment, TLS is only used by the web server.</para>
  </description>
 
  <related>tls certfile</related>
diff --git a/docs-xml/smbdotconf/security/tlskeyfile.xml b/docs-xml/smbdotconf/security/tlskeyfile.xml
new file mode 100644
index 0000000000..a37a9381ee
--- /dev/null
+++ b/docs-xml/smbdotconf/security/tlskeyfile.xml
@@ -0,0 +1,18 @@
+<samba:parameter name="tls keyfile"
+                 type="string"
+                 context="G"
+                 basic="1" advanced="1" developer="1"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+ <description>
+	 <para>This option can be set to a file (PEM format)
+		 containing the RSA private key. This file must be accessible without
+		 a pass-phrase, i.e. it must not be encrypted.</para>
+ </description>
+
+ <related>tls certfile</related>
+ <related>tls crlfile</related>
+ <related>tls dh params file</related>
+ <related>tls enabled</related>
+ <related>tls cafile</related>
+ <value type="default"></value>
+</samba:parameter>
-- 
cgit