diff options
| author | Michael Scherer <misc@mageia.org> | 2011-05-29 12:51:26 +0000 |
|---|---|---|
| committer | Michael Scherer <misc@mageia.org> | 2011-05-29 12:51:26 +0000 |
| commit | d5a1d4bbe92d1fa5356c07538e193ce18458afbe (patch) | |
| tree | 13bc1b0c54eaac6a546a7bc8763e938c461b658b /modules/openldap | |
| parent | d3c23c53d10b60bd28fd0f680d73d8eb70a26ce3 (diff) | |
| download | puppet-d5a1d4bbe92d1fa5356c07538e193ce18458afbe.tar puppet-d5a1d4bbe92d1fa5356c07538e193ce18458afbe.tar.gz puppet-d5a1d4bbe92d1fa5356c07538e193ce18458afbe.tar.bz2 puppet-d5a1d4bbe92d1fa5356c07538e193ce18458afbe.tar.xz puppet-d5a1d4bbe92d1fa5356c07538e193ce18458afbe.zip | |
workaround problem on 2010.0 , where kolab schema conflict with
another one we use
Diffstat (limited to 'modules/openldap')
| -rw-r--r-- | modules/openldap/templates/slapd.conf | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/modules/openldap/templates/slapd.conf b/modules/openldap/templates/slapd.conf index 06191b03..ac67b714 100644 --- a/modules/openldap/templates/slapd.conf +++ b/modules/openldap/templates/slapd.conf @@ -11,7 +11,10 @@ include /usr/share/openldap/schema/rfc2307bis.schema include /usr/share/openldap/schema/openldap.schema #include /usr/share/openldap/schema/autofs.schema include /usr/share/openldap/schema/samba.schema -include /usr/share/openldap/schema/kolab.schema +# removed as it cause issue on 2010.0 : +# /usr/share/openldap/schema/kolab.schema: +# line 175 objectclass: Duplicate objectClass: "1.3.6.1.4.1.5322.13.1.1" +#include /usr/share/openldap/schema/kolab.schema include /usr/share/openldap/schema/evolutionperson.schema include /usr/share/openldap/schema/calendar.schema include /usr/share/openldap/schema/sudo.schema |