From 96b2d920ab8bfd468a47178d89df621b2fe65433 Mon Sep 17 00:00:00 2001 From: cajus Date: Mon, 7 Apr 2008 11:02:43 +0000 Subject: [PATCH] Made it more foolproof git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@10228 594d385d-05f5-0310-b6e9-bd551577e9d8 --- .../{gosa.schema => gosa-samba2.schema} | 0 ...{gosa+samba3.schema => gosa-samba3.schema} | 0 gosa-core/contrib/openldap/slapd.conf | 24 +++++++------------ 3 files changed, 8 insertions(+), 16 deletions(-) rename gosa-core/contrib/openldap/{gosa.schema => gosa-samba2.schema} (100%) rename gosa-core/contrib/openldap/{gosa+samba3.schema => gosa-samba3.schema} (100%) diff --git a/gosa-core/contrib/openldap/gosa.schema b/gosa-core/contrib/openldap/gosa-samba2.schema similarity index 100% rename from gosa-core/contrib/openldap/gosa.schema rename to gosa-core/contrib/openldap/gosa-samba2.schema diff --git a/gosa-core/contrib/openldap/gosa+samba3.schema b/gosa-core/contrib/openldap/gosa-samba3.schema similarity index 100% rename from gosa-core/contrib/openldap/gosa+samba3.schema rename to gosa-core/contrib/openldap/gosa-samba3.schema diff --git a/gosa-core/contrib/openldap/slapd.conf b/gosa-core/contrib/openldap/slapd.conf index afb48de04..8cebaf837 100644 --- a/gosa-core/contrib/openldap/slapd.conf +++ b/gosa-core/contrib/openldap/slapd.conf @@ -14,22 +14,14 @@ 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/gosa-samba3.schema +include /etc/ldap/schema/gosa/trust.schema # Schema check allows for forcing entries to # match schemas for their objectClasses's -- 2.30.2