Merge branch 'template' of ssh://matthijs@git.stderr.nl/matthijs/servers/drsnuggles... ldap
authorroot <root@ldap.drsnuggles.stderr.nl>
Tue, 3 Aug 2010 15:51:55 +0000 (17:51 +0200)
committerroot <root@ldap.drsnuggles.stderr.nl>
Tue, 3 Aug 2010 15:51:55 +0000 (17:51 +0200)
commit6330fe9c61e1dd6442e83740e5523c9b9e2e0149
tree3fbc69185e2240a85055eab17e100498d86263f8
parent2c1aaceb27c479f2aeaec517e81fd466105371d9
parenta799b50b1d46b49b57ce3212c2fcf60317e7a6f9
Merge branch 'template' of ssh://matthijs@git.stderr.nl/matthijs/servers/drsnuggles into ldap

* 'template' of ssh://matthijs@git.stderr.nl/matthijs/servers/drsnuggles:
  oidentd: Allow the vserver host to forward connections.
  oidentd: Add default configuration.