Added negate button

[gosa.git] / gosa-core / contrib / openldap / slapd.conf

diff --git a/gosa-core/contrib/openldap/slapd.conf b/gosa-core/contrib/openldap/slapd.conf
index afb48de0474fa36847478fdc4079bffa6f7166ba..73ba870c59151436fbd0ac444fb93687929616e2 100644 (file)
--- a/gosa-core/contrib/openldap/slapd.conf
+++ b/gosa-core/contrib/openldap/slapd.conf
@@ -14,22 +14,15 @@ include     /etc/ldap/schema/inetorgperson.schema
 include        /etc/ldap/schema/openldap.schema
 include                /etc/ldap/schema/nis.schema
 include                /etc/ldap/schema/misc.schema
-include                /etc/ldap/schema/trust.schema
-#include       /etc/ldap/schema/krb5-kdc.schema
-
-# These should be present for GOsa. In case of samba3,
-# replace samba.schema and gosa.schema by samba3.schema
-# and gosa+samba3.schema. Don't include both and remember
-# to adjust the indexing and acl stuff below!
-include                /etc/ldap/schema/samba.schema
-include                /etc/ldap/schema/pureftpd.schema
-include                /etc/ldap/schema/gofon.schema
-include                /etc/ldap/schema/gosystem.schema
-include                /etc/ldap/schema/goto.schema
-include                /etc/ldap/schema/gosa+samba3.schema
-include                /etc/ldap/schema/gofax.schema
-include                /etc/ldap/schema/goserver.schema
-include                /etc/ldap/schema/goto-mime.schema
+
+# These should be present for GOsa. Replace all occurencies
+# of samba3 by samba2 for use with GOsa and Samba 2.
+include                /etc/ldap/schema/gosa/samba3.schema
+include                /etc/ldap/schema/gosa/gosystem.schema
+include                /etc/ldap/schema/gosa/goto.schema
+include                /etc/ldap/schema/gosa/goserver.schema
+include                /etc/ldap/schema/gosa/gosa-samba3.schema
+include                /etc/ldap/schema/gosa/trust.schema
 
 # Schema check allows for forcing entries to
 # match schemas for their objectClasses's