From e2ee93b2351537b81cc1b7330f97e8ded531e018 Mon Sep 17 00:00:00 2001 From: Andrew Branson Date: Thu, 24 Jan 2013 15:55:00 +0100 Subject: Rename schema file to drop the '2' from cristal --- bin/openldap/cristal.schema | 49 ++++++++++++++++++++++++++++++++++++++++++++ bin/openldap/cristal2.schema | 49 -------------------------------------------- bin/openldap/slapd.conf | 2 +- 3 files changed, 50 insertions(+), 50 deletions(-) create mode 100644 bin/openldap/cristal.schema delete mode 100644 bin/openldap/cristal2.schema diff --git a/bin/openldap/cristal.schema b/bin/openldap/cristal.schema new file mode 100644 index 0000000..2370964 --- /dev/null +++ b/bin/openldap/cristal.schema @@ -0,0 +1,49 @@ +attributetype ( 1.3.6.1.4.1.96.64.10.1 NAME 'intsyskey' + EQUALITY integerMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 ) + +attributetype ( 1.3.6.1.4.1.96.64.10.6 NAME 'ior' + EQUALITY caseIgnoreMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 + SINGLE-VALUE ) + +attributetype ( 1.3.6.1.4.1.96.64.10.7 NAME 'cristalprop' + EQUALITY caseIgnoreMatch + SUBSTR caseIgnoreSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 ) + +objectclass ( 1.3.6.1.4.1.96.64.10.10 NAME 'cristalentity' SUP top STRUCTURAL + MUST ( cn $ objectclass ) + MAY ( intsyskey $ ior $ cristalprop ) ) + +objectclass ( 1.3.6.1.4.1.96.64.10.13 NAME 'cristalcontext' SUP top STRUCTURAL + MUST ( cn $ objectclass ) + MAY ( intsyskey ) ) + +objectclass ( 1.3.6.1.4.1.96.64.10.15 NAME 'aliasObject' SUP alias STRUCTURAL + MUST ( cn $ objectclass $ aliasedObjectName ) ) + +# agent +attributetype ( 1.3.6.1.4.1.96.64.10.8 NAME 'jobList' + EQUALITY booleanMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 ) + + # uid must store userName if agent (for authentication to work) +objectclass ( 1.3.6.1.4.1.96.64.10.14 NAME 'cristalagent' SUP cristalentity STRUCTURAL + MUST ( userPassword $ uid ) ) + +objectclass ( 1.3.6.1.4.1.96.64.10.16 NAME 'cristalrole' SUP top STRUCTURAL + MUST ( cn $ objectclass ) + MAY ( jobList $ uniqueMember ) ) + +# old + +attributetype ( 1.3.6.1.4.1.96.64.10.2 NAME 'propval' + EQUALITY caseIgnoreMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 + SINGLE-VALUE ) + +objectclass ( 1.3.6.1.4.1.96.64.10.11 NAME 'cristalproperty' SUP top STRUCTURAL + MUST ( cn $ objectclass ) + MAY ( propval ) ) + diff --git a/bin/openldap/cristal2.schema b/bin/openldap/cristal2.schema deleted file mode 100644 index 2370964..0000000 --- a/bin/openldap/cristal2.schema +++ /dev/null @@ -1,49 +0,0 @@ -attributetype ( 1.3.6.1.4.1.96.64.10.1 NAME 'intsyskey' - EQUALITY integerMatch - SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 ) - -attributetype ( 1.3.6.1.4.1.96.64.10.6 NAME 'ior' - EQUALITY caseIgnoreMatch - SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 - SINGLE-VALUE ) - -attributetype ( 1.3.6.1.4.1.96.64.10.7 NAME 'cristalprop' - EQUALITY caseIgnoreMatch - SUBSTR caseIgnoreSubstringsMatch - SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 ) - -objectclass ( 1.3.6.1.4.1.96.64.10.10 NAME 'cristalentity' SUP top STRUCTURAL - MUST ( cn $ objectclass ) - MAY ( intsyskey $ ior $ cristalprop ) ) - -objectclass ( 1.3.6.1.4.1.96.64.10.13 NAME 'cristalcontext' SUP top STRUCTURAL - MUST ( cn $ objectclass ) - MAY ( intsyskey ) ) - -objectclass ( 1.3.6.1.4.1.96.64.10.15 NAME 'aliasObject' SUP alias STRUCTURAL - MUST ( cn $ objectclass $ aliasedObjectName ) ) - -# agent -attributetype ( 1.3.6.1.4.1.96.64.10.8 NAME 'jobList' - EQUALITY booleanMatch - SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 ) - - # uid must store userName if agent (for authentication to work) -objectclass ( 1.3.6.1.4.1.96.64.10.14 NAME 'cristalagent' SUP cristalentity STRUCTURAL - MUST ( userPassword $ uid ) ) - -objectclass ( 1.3.6.1.4.1.96.64.10.16 NAME 'cristalrole' SUP top STRUCTURAL - MUST ( cn $ objectclass ) - MAY ( jobList $ uniqueMember ) ) - -# old - -attributetype ( 1.3.6.1.4.1.96.64.10.2 NAME 'propval' - EQUALITY caseIgnoreMatch - SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 - SINGLE-VALUE ) - -objectclass ( 1.3.6.1.4.1.96.64.10.11 NAME 'cristalproperty' SUP top STRUCTURAL - MUST ( cn $ objectclass ) - MAY ( propval ) ) - diff --git a/bin/openldap/slapd.conf b/bin/openldap/slapd.conf index 4502164..ebf42df 100644 --- a/bin/openldap/slapd.conf +++ b/bin/openldap/slapd.conf @@ -1,5 +1,5 @@ include /etc/openldap/schema/core.schema -include cristal-kernel/bin/openldap/cristal2.schema +include cristal-kernel/bin/openldap/cristal.schema pidfile /var/run/slapd/slapd.pid argsfile /var/run/slapd/slapd.args -- cgit v1.2.3