Skip to content
Snippets Groups Projects
Commit 9a060c5c authored by micah's avatar micah :speech_balloon:
Browse files

Merge branch 'master' into debian

Conflicts:
	AUTHORS
	examples/example.ldap
parents b092a1a1 81921efa
No related branches found
No related tags found
No related merge requests found
...@@ -43,3 +43,10 @@ ...@@ -43,3 +43,10 @@
## to, not needed for slapcat ## to, not needed for slapcat
# binddn = # binddn =
## 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
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment