diff options
| author | intrigeri <intrigeri@boum.org> | 2010-08-26 02:04:13 +0200 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2010-08-26 02:04:13 +0200 |
| commit | 93041732b3ccffa113693af8480d69fc080d9ec1 (patch) | |
| tree | b2950b49cba6a22b448a7e88819c2ac6c26847ad /examples/example.ldap | |
| parent | e6c65815c8201d123f477e05a367832204c39886 (diff) | |
| parent | 40155781065eb7254eb9fc9c48bd85b0b8ace4c0 (diff) | |
| download | backupninja-93041732b3ccffa113693af8480d69fc080d9ec1.tar.gz backupninja-93041732b3ccffa113693af8480d69fc080d9ec1.tar.bz2 | |
Merge branch 'master' into debian
Conflicts:
examples/example.ldap
Diffstat (limited to 'examples/example.ldap')
| -rw-r--r-- | examples/example.ldap | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/examples/example.ldap b/examples/example.ldap index ee7c57d..174ed1d 100644 --- a/examples/example.ldap +++ b/examples/example.ldap @@ -46,6 +46,11 @@ ## ldaphost (no default): set this to your ldap host if it is not local # ldaphost = -## tls (default yes): if set to 'yes' then TLS connection will be -## attempted to your ldaphost by using the URI base ldaps: otherwise ldap: will be used -# tls = yes
\ No newline at end of file +## ssl (default yes): if set to 'yes' then SSL connection will be +## attempted to your ldaphost by using ldaps:// +# ssl = yes + +## tls (default no): if set to 'yes' then TLS connection will be +## attempted to your ldaphost by using TLS extended operations (RFC2246, +## RFC2830) +# tls = no |