accounts2 fedoraGroup.schema, 1.2, 1.3 fedoraPerson.schema, 1.4, 1.5 fedoraMembership.schema, 1.2, NONE

[Tom Lynema (lyz)]

Author: lyz

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

Modified Files:
	fedoraGroup.schema fedoraPerson.schema 
Removed Files:
	fedoraMembership.schema 
Log Message:
added fedora to the begining of attributes



Index: fedoraGroup.schema
===================================================================
RCS file: /cvs/fedora/accounts2/fedoraGroup.schema,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fedoraGroup.schema	12 Oct 2006 00:18:37 -0000	1.2
+++ fedoraGroup.schema	30 Nov 2006 02:57:19 -0000	1.3
@@ -3,34 +3,35 @@
 #owner (the owner's DN) 
 #group_type 
 #needs_sponsor 
-#user_can_remove (will be handled by ACLs, but we need to clue the interface about it) #prerequisite_id (no idea what that is, so maybe not)  -- not included yet
+#user_can_remove (will be handled by ACLs, but we need to clue the interface about it) 
+#prerequisite_id (no idea what that is, so maybe not)  -- not included yet
 #joinmsg 
 
 
-attributeType ( 2.5.444.10 NAME 'groupowner'
+attributeType ( 2.5.444.10 NAME 'fedoraGroupOwner'
                 DESC 'group owner'
                 EQUALITY caseIgnoreMatch
                 SUBSTR caseIgnoreSubstringsMatch
                 SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{50} )
 
 
-attributeType ( 2.5.444.11 NAME 'grouptype'
+attributeType ( 2.5.444.11 NAME 'fedoraGroupType'
                 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.444.12 NAME 'needssponsor'
+attributeType ( 2.5.444.12 NAME 'fedoraGroupNeedsSponsor'
                 DESC 'boolean indicating whether or not the group needs a sponsor'
                 EQUALITY booleanMatch
                 SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
 
-attributeType ( 2.5.444.13 NAME 'usercanremove'
+attributeType ( 2.5.444.13 NAME 'fedoraGroupUserCanRemove'
                 DESC 'boolean indicating whether or not the user can remove the group'
                 EQUALITY booleanMatch
                 SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 )
 
-attributeType ( 2.5.444.14 NAME 'joinmsg'
+attributeType ( 2.5.444.14 NAME 'fedoraGroupJoinMsg'
                 DESC 'message received upon joining the group'
                 SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{1000} )
 
@@ -38,10 +39,7 @@
 objectclass	( 2.5.555.3
     NAME 'fedoraGroup'
 	DESC 'A object describing a group entry'
-    STRUCTURAL
-	MAY (
-		joinmsg $ usercanremove $ grouptype $ needssponsor $ 
-		usercanremove )
-	)
-	MUST ( 
-		cn $ groupowner )
+   STRUCTURAL
+	MAY (  fedoraGroupJoinMsg $ fedoraGroupUsercanRemove $ fedoraGroupType $ fedoraGroupNeedsSponsor $ fedoraGroupUserCanRemove )
+	MUST ( 	cn $ fedoraGroupOwner )
+ )


Index: fedoraPerson.schema
===================================================================
RCS file: /cvs/fedora/accounts2/fedoraPerson.schema,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fedoraPerson.schema	22 Nov 2006 00:25:45 -0000	1.4
+++ fedoraPerson.schema	30 Nov 2006 02:57:19 -0000	1.5
@@ -3,33 +3,33 @@
 #attribues added onto it for use by the Account system
 #for now this is the contents
 #sshkey bugzillaemail ircNick approvalStatus creationDate
-attributeType ( 2.5.444.8 NAME 'sshKey'
+attributeType ( 2.5.444.8 NAME 'fedoraPersonSshKey'
                 DESC 'ssh key for this member'
                 EQUALITY caseIgnoreMatch
                 SUBSTR caseIgnoreSubstringsMatch
                 SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{4096} 
 	    SINGLE-VALUE)
 
-attributeType ( 2.5.444.9 NAME 'bugzillaMail'
+attributeType ( 2.5.444.9 NAME 'fedoraPersonBugzillaMail'
         DESC 'members preferred bugzilla email address'
 	EQUALITY caseIgnoreIA5Match
 	SUBSTR caseIgnoreIA5SubstringsMatch
 	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{256} )
 
-attributeType ( 2.5.444.16 NAME 'ircNick'
+attributeType ( 2.5.444.16 NAME 'fedoraPersonIrcNick'
                 DESC 'irc nick of the user on freenode'
                 EQUALITY caseIgnoreMatch
                 SUBSTR caseIgnoreSubstringsMatch
                 SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{100} )
 
-attributetype ( 2.5.444.17 NAME 'personCreationDate'
+attributetype ( 2.5.444.17 NAME 'fedoraPersonCreationDate'
  	DESC 'date entry was created'
  	EQUALITY caseIgnoreIA5Match
  	SUBSTR caseIgnoreIA5SubstringsMatch
  	SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
  	SINGLE-VALUE )
 
-attributeType ( 2.5.444.18 NAME 'approvalStatus'
+attributeType ( 2.5.444.18 NAME 'fedoraPersonApprovalStatus'
                DESC 'users approval status'
                EQUALITY caseIgnoreMatch
                SUBSTR caseIgnoreSubstringsMatch
@@ -44,6 +44,6 @@
     DESC 'A member of the fedoraproject group'
     SUP inetOrgPerson
     STRUCTURAL
-	MUST ( sshKey $ mail $ personCreationDate )
-	MAY  (ircNick $ approvalStatus $ bugzillaMail )
+	MUST ( fedoraPersonSshKey $ mail $ fedoraPersonCreationDate )
+	MAY  (fedoraPersonIrcNick $ fedoraPersonApprovalStatus $ fedoraPersonBugzillaMail )
    )


--- fedoraMembership.schema DELETED ---