accounts2 fedoraGroup.schema, 1.1, 1.2 fedoraMembership.schema, 1.1, 1.2 fedoraPerson.schema, 1.2, 1.3

Tom Lynema (lyz) fedora-extras-commits at redhat.com
Thu Oct 12 00:18:39 UTC 2006


Author: lyz

Update of /cvs/fedora/accounts2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5819

Modified Files:
	fedoraGroup.schema fedoraMembership.schema fedoraPerson.schema 
Log Message:
it actually loads in openldap now



Index: fedoraGroup.schema
===================================================================
RCS file: /cvs/fedora/accounts2/fedoraGroup.schema,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fedoraGroup.schema	27 Sep 2006 01:17:49 -0000	1.1
+++ fedoraGroup.schema	12 Oct 2006 00:18:37 -0000	1.2
@@ -7,29 +7,41 @@
 #joinmsg 
 
 
-attributeType ( 2.5.4.41 NAME 'owner'
+attributeType ( 2.5.444.10 NAME 'groupowner'
                 DESC 'group owner'
                 EQUALITY caseIgnoreMatch
                 SUBSTR caseIgnoreSubstringsMatch
                 SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{50} )
 
 
-attributeType ( 2.5.4.41 NAME 'group_type'
+attributeType ( 2.5.444.11 NAME 'grouptype'
                 DESC 'the type of group'
                 EQUALITY caseIgnoreMatch
                 SUBSTR caseIgnoreSubstringsMatch
                 SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{50} )
 
-attributeType ( 2.5.4.41 NAME 'needs_sponsor'
+attributeType ( 2.5.444.12 NAME 'needssponsor'
                 DESC 'boolean indicating whether or not the group needs a sponsor'
-                EQUALITY caseIgnoreMatch
+                EQUALITY booleanMatch
                 SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
 
-attributeType ( 2.5.4.41 NAME 'user_can_remove'
+attributeType ( 2.5.444.13 NAME 'usercanremove'
                 DESC 'boolean indicating whether or not the user can remove the group'
-                EQUALITY caseIgnoreMatch
+                EQUALITY booleanMatch
                 SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
 
-attributeType ( 2.5.4.41 NAME 'joing_msg'
-                DESC message received upon joining the group'
-                SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{1000} )
\ No newline at end of file
+attributeType ( 2.5.444.14 NAME 'joinmsg'
+                DESC 'message received upon joining the group'
+                SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{1000} )
+
+
+objectclass	( 2.5.555.3
+    NAME 'fedoraGroup'
+	DESC 'A object describing a group entry'
+    STRUCTURAL
+	MAY (
+		joinmsg $ usercanremove $ grouptype $ needssponsor $ 
+		usercanremove )
+	)
+	MUST ( 
+		cn $ groupowner )


Index: fedoraMembership.schema
===================================================================
RCS file: /cvs/fedora/accounts2/fedoraMembership.schema,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fedoraMembership.schema	27 Sep 2006 01:17:49 -0000	1.1
+++ fedoraMembership.schema	12 Oct 2006 00:18:37 -0000	1.2
@@ -9,46 +9,61 @@
 #sponsor (points to the sponsor's DN) 
 #creation (date) 
 #approval (date) 
+#don't have a name use cn instead
+#attributeType ( 2.5.444.1 NAME 'name'
+#                DESC 'group name'
+#                EQUALITY caseIgnoreMatch
+#                SUBSTR caseIgnoreSubstringsMatch
+#                SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{50} )
 
-attributeType ( 2.5.4.41 NAME 'name'
-                DESC 'group name'
-                EQUALITY caseIgnoreMatch
-                SUBSTR caseIgnoreSubstringsMatch
-                SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{50} )
-
-attributeType ( 2.5.4.41 NAME 'role_type'
+attributeType ( 2.5.444.2 NAME 'roletype'
                 DESC 'the type of membership role'
                 EQUALITY caseIgnoreMatch
                 SUBSTR caseIgnoreSubstringsMatch
                 SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{25} )
 
 
-attributeType ( 2.5.4.41 NAME 'role_status'
+attributeType ( 2.5.444.15 NAME 'roledomain'
+                DESC 'the domain of this role'
+                EQUALITY caseIgnoreMatch
+                SUBSTR caseIgnoreSubstringsMatch
+                SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{15} )
+
+attributeType ( 2.5.444.3 NAME 'rolestatus'
                 DESC 'the approval status of this role'
                 EQUALITY caseIgnoreMatch
                 SUBSTR caseIgnoreSubstringsMatch
                 SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{15} )
 
 
-attributeType ( 2.5.4.41 NAME 'internal_comments'
+attributeType ( 2.5.444.4 NAME 'internalcomments'
                  DESC 'group membership comments'
                 SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{1000} )
 
 
-attributeType ( 2.5.4.41 NAME 'sponsor'
+attributeType ( 2.5.444.5 NAME 'sponsor'
                 DESC 'membership sponsor'
                 SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{25} )
 
-attributeType ( 2.5.4.41 NAME 'creation_date'
-                DESC 'membership creation_date'
+attributeType ( 2.5.444.6 NAME 'creationdate'
+                DESC 'membership creation date'
                 EQUALITY integerMatch
                 SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 )
 
-attributeType ( 2.5.4.41 NAME 'approval_date'
-                DESC 'membership creation_date'
+attributeType ( 2.5.444.7 NAME 'approvaldate'
+                DESC 'membership approval date'
                 EQUALITY integerMatch
                 SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 )
 	
 
 
-
+objectclass	( 2.5.555.2
+    NAME 'fedoraMembership'
+	DESC 'An object describing a persons memebership'
+    STRUCTURAL
+	MAY (
+		approvaldate $ creationdate $ approvaldate $ roletype $
+		rolestatus $ roledomain $ internalcomments $ sponsor )
+	)
+	MUST ( 
+		cn  )


Index: fedoraPerson.schema
===================================================================
RCS file: /cvs/fedora/accounts2/fedoraPerson.schema,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fedoraPerson.schema	2 Oct 2006 02:46:31 -0000	1.2
+++ fedoraPerson.schema	12 Oct 2006 00:18:37 -0000	1.3
@@ -2,24 +2,24 @@
 #it is based on the inetOrgPerson shema, but has some spicific
 #attribues added onto it for use by the Account system
 #for now this is the contents
-#ssh_key
-attributeType ( 2.5.4.41 NAME 'ssh_key'
+#sshkey bugzillaemail
+attributeType ( 2.5.444.8 NAME 'sshkey'
                 DESC 'ssh key for this memeber'
                 EQUALITY caseIgnoreMatch
                 SUBSTR caseIgnoreSubstringsMatch
                 SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{50} )
 
-attributeType ( 2.5.4.41 NAME 'bugzilla_email'
-                DESC 'members preferred bugzilla email address'
-		EQUALITY caseIgnoreIA5Match
-		SUBSTR caseIgnoreIA5SubstringsMatch
-                SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{50} )
+attributeType ( 2.5.444.9 NAME 'bugzillaemail'
+        DESC 'members preferred bugzilla email address'
+	EQUALITY caseIgnoreIA5Match
+	SUBSTR caseIgnoreIA5SubstringsMatch
+	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
 
 # fedoraPerson
 # The fedoraPerson represents people who are a member of the fedora project
 # in some way.  It is a structural class and inherits
 # from the inetOrgPerson class
-objectclass	( 2.16.840.1.113730.3.2.2
+objectclass	( 2.5.555.1
     NAME 'fedoraPerson'
 	DESC 'A member of the fedoraproject group'
     SUP inetOrgPerson
@@ -34,5 +34,5 @@
 		userSMIMECertificate $ userPKCS12 )
 	)
 	MUST (
-		ssh_key $ bugzilla_email 
+		sshkey $ bugzillaemail 
 	)




More information about the fedora-extras-commits mailing list