summaryrefslogtreecommitdiff
path: root/docs-xml/smbdotconf
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2009-03-31 13:59:56 +1100
committerAndrew Tridgell <tridge@samba.org>2009-03-31 13:59:56 +1100
commit046b7a35bed76f5d92a1e5f658478e25ffadf9ac (patch)
tree1500a19e70a4f90b5c3057d753aa1ae0a6e04788 /docs-xml/smbdotconf
parent84547b8dba3c0cf4e20b3c50d9386081d475df6b (diff)
parent9be2e2fdce9f0823f428afd492c066eb5e097f59 (diff)
downloadsamba-046b7a35bed76f5d92a1e5f658478e25ffadf9ac.tar.gz
samba-046b7a35bed76f5d92a1e5f658478e25ffadf9ac.tar.bz2
samba-046b7a35bed76f5d92a1e5f658478e25ffadf9ac.zip
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'docs-xml/smbdotconf')
-rw-r--r--docs-xml/smbdotconf/printing/cupsencrypt.xml25
1 files changed, 25 insertions, 0 deletions
diff --git a/docs-xml/smbdotconf/printing/cupsencrypt.xml b/docs-xml/smbdotconf/printing/cupsencrypt.xml
new file mode 100644
index 0000000000..f93b1c5935
--- /dev/null
+++ b/docs-xml/smbdotconf/printing/cupsencrypt.xml
@@ -0,0 +1,25 @@
+<samba:parameter name="cups encrypt"
+ context="G"
+ type="enum"
+ advanced="1" print="1"
+ xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+<description>
+ <para>
+ This parameter is only applicable if <smbconfoption name="printing"/>
+ is set to <constant>cups</constant> and if you use CUPS newer than
+ 1.0.x.It is used to define whether or not Samba should use encryption
+ when talking to the CUPS server. Possible values are
+ <emphasis>auto</emphasis>, <emphasis>yes</emphasis> and
+ <emphasis>no</emphasis>
+ </para>
+
+ <para>
+ When set to auto we will try to do a TLS handshake on each CUPS
+ connection setup. If that fails, we will fall back to unencrypted
+ operation.
+ </para>
+
+</description>
+
+<value type="default">"no"</value>
+</samba:parameter>