Merge branch 'master' into next

This commit is contained in:
Nicolas Sebrecht 2011-01-07 19:26:19 +01:00
commit 9d4ebe2072

View File

@ -282,7 +282,7 @@ ssl = yes
# No SSL verification is done without this option, if it is # No SSL verification is done without this option, if it is
# specified, the CA Cert(s) need to verify the Server cert AND # specified, the CA Cert(s) need to verify the Server cert AND
# match the hostname (* wildcard allowed on the left hand side) # match the hostname (* wildcard allowed on the left hand side)
# sslcacertcertfile = /path/to/cacertfile.crt # sslcacertfile = /path/to/cacertfile.crt
# Specify the port. If not specified, use a default port. # Specify the port. If not specified, use a default port.
# remoteport = 993 # remoteport = 993