From ba530cab74577ff63b2c6fa25c9cbaca433502f8 Mon Sep 17 00:00:00 2001
From: Miles Lott <milosch@alumni.egroupware.org>
Date: Mon, 14 May 2001 01:49:34 +0000
Subject: [PATCH] Update contact schema to working setup, still unofficial

---
 phpgwapi/doc/ldap/README              |  3 +++
 phpgwapi/doc/ldap/phpgwcontact.schema | 27 +++++++++++++++++----------
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/phpgwapi/doc/ldap/README b/phpgwapi/doc/ldap/README
index afd9bf2b15..5d729b4d40 100644
--- a/phpgwapi/doc/ldap/README
+++ b/phpgwapi/doc/ldap/README
@@ -28,3 +28,6 @@ include		/etc/openldap/schema/phpgwaccount.schema
 Other files:
 
 	phpgwcontact.schema		VERY new and unfinished contacts schema
+
+This now has what appears to be a proper definition for the attributes
+and the objectclass, but they are not official yet.
diff --git a/phpgwapi/doc/ldap/phpgwcontact.schema b/phpgwapi/doc/ldap/phpgwcontact.schema
index 856bafa7fd..fd649b3f17 100644
--- a/phpgwapi/doc/ldap/phpgwcontact.schema
+++ b/phpgwapi/doc/ldap/phpgwcontact.schema
@@ -1,25 +1,34 @@
 # $phpgroupware : addressbook/phpgwcontact.schema,v 1.0 2000/07/29 01:53:16 milosch Exp $
 
+# REQUIRED
 attributetype ( 2.3.6.1.1.1.1.100
 	NAME 'phpgwContactTypeId'
-	EQUALITY integerMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
+	EQUALITY numericStringMatch
+	SUBSTR numericStringSubstringsMatch
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.36{16} )
 
+# REQUIRED
 attributetype ( 2.3.6.1.1.1.1.101
 	NAME 'phpgwContactCatId'
-	EQUALITY integerMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
+	EQUALITY numericStringMatch
+	SUBSTR numericStringSubstringsMatch
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.36{16} )
 
+# REQUIRED
 attributetype ( 2.3.6.1.1.1.1.102
 	NAME 'phpgwContactAccess'
-	EQUALITY caseExactIA5Match
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
+	EQUALITY caseIgnoreMatch
+	SUBSTR caseIgnoreSubstringsMatch
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{1024} )
 
+# REQUIRED
 attributetype ( 2.3.6.1.1.1.1.103
 	NAME 'phpgwContactOwner'
-	EQUALITY integerMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
+	EQUALITY numericStringMatch
+	SUBSTR numericStringSubstringsMatch
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.36{16} )
 
+# BELOW ARE OPTIONAL
 attributetype ( 2.3.6.1.1.1.1.105
 	NAME 'phpgwMiddlename'
 	EQUALITY caseExactIA5Match
@@ -198,8 +207,6 @@ attributetype ( 2.3.6.1.1.1.1.134
 objectclass	( 2.3.6.1.1.1.1.200
 	NAME 'phpgwContact'
 	DESC 'phpGroupWare Contact Entry'
-    SUP organizationalPerson
-    STRUCTURAL
 	MUST(
 		uid $ uidnumber $ phpgwContactTypeId $ phpgwContactCatId $
 		phpgwContactAccess $ phpgwContactOwner )