You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by ta...@apache.org on 2004/05/14 02:15:00 UTC
cvs commit: jakarta-jetspeed/src/ldap jetspeed.ldif jetspeed.schema
taylor 2004/05/13 17:15:00
Modified: src/ldap jetspeed.ldif jetspeed.schema
Log:
[PATCH] Schema violation on OpenLDAP 2.1.12
from Sami Leino
PR:
Obtained from:
Submitted by:
Reviewed by:
CVS: ----------------------------------------------------------------------
CVS: PR:
CVS: If this change addresses a PR in the problem report tracking
CVS: database, then enter the PR number(s) here.
CVS: Obtained from:
CVS: If this change has been taken from another system, such as NCSA,
CVS: then name the system in this line, otherwise delete it.
CVS: Submitted by:
CVS: If this code has been contributed to Apache by someone else; i.e.,
CVS: they sent us a patch or a new module, then include their name/email
CVS: address here. If this is your work then delete this line.
CVS: Reviewed by:
CVS: If we are doing pre-commit code reviews and someone else has
CVS: reviewed your changes, include their name(s) here.
CVS: If you have not had it reviewed then delete this line.
Revision Changes Path
1.4 +0 -2 jakarta-jetspeed/src/ldap/jetspeed.ldif
Index: jetspeed.ldif
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/ldap/jetspeed.ldif,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- jetspeed.ldif 12 Feb 2003 00:02:10 -0000 1.3
+++ jetspeed.ldif 14 May 2004 00:15:00 -0000 1.4
@@ -85,7 +85,6 @@
permissionname: minimize
dn: uid=personalize, ou=permissions, ou=jetspeed, o=apache
-
uid: personalize
objectClass: jetspeedpermission
permissionname: personalize
@@ -177,4 +176,3 @@
uid: customize
objectClass: jetspeedpermission
permissionname: customize
-
1.4 +16 -17 jakarta-jetspeed/src/ldap/jetspeed.schema
Index: jetspeed.schema
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/src/ldap/jetspeed.schema,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- jetspeed.schema 28 Jan 2003 04:52:17 -0000 1.3
+++ jetspeed.schema 14 May 2004 00:15:00 -0000 1.4
@@ -1,24 +1,24 @@
attributetype ( 1.3.6.1.4.1.7915.1.2.3.1 NAME 'groupname'
- DESC 'group name'
+ DESC 'Group name'
EQUALITY caseIgnoreIA5Match
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
SINGLE-VALUE )
attributetype ( 1.3.6.1.4.1.7915.1.2.3.2 NAME 'rolename'
- DESC 'role name'
+ DESC 'Role name'
EQUALITY caseIgnoreIA5Match
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
SINGLE-VALUE )
attributetype ( 1.3.6.1.4.1.7915.1.2.3.3 NAME 'permissionname'
- DESC 'role name'
+ DESC 'Permission name'
EQUALITY caseIgnoreIA5Match
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
SINGLE-VALUE )
attributetype ( 1.3.6.1.4.1.7915.1.2.3.4 NAME 'rolepermissions'
- DESC 'role rigth'
+ DESC 'Role permission'
EQUALITY caseExactIA5Match
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26)
attributetype ( 1.3.6.1.4.1.7915.1.2.3.5 NAME 'members'
- DESC 'member list'
+ DESC 'Member list'
EQUALITY caseExactIA5Match
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26)
attributetype ( 1.3.6.1.4.1.7915.1.2.3.6 NAME 'confirm'
@@ -31,47 +31,46 @@
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
SINGLE-VALUE )
attributetype ( 1.3.6.1.4.1.7915.1.2.3.8 NAME 'usergrouprole'
- DESC 'User Group Role'
+ DESC 'Role of the user within the specified group'
EQUALITY caseIgnoreIA5Match
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
attributetype ( 1.3.6.1.4.1.7915.1.2.3.9 NAME 'lastlogindate'
- DESC 'Last Login Date'
+ DESC 'Last login date'
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
SINGLE-VALUE )
attributetype ( 1.3.6.1.4.1.7915.1.2.3.10 NAME 'lastmodifieddate'
- DESC 'Last Modified Date'
+ DESC 'Last modified date'
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
SINGLE-VALUE )
attributetype ( 1.3.6.1.4.1.7915.1.2.3.11 NAME 'creationdate'
- DESC 'Account Creation Date'
+ DESC 'Account creation date'
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
SINGLE-VALUE )
attributetype ( 1.3.6.1.4.1.7915.1.2.3.12 NAME 'disabled'
- DESC 'User Disable Flag'
+ DESC 'User disable flag'
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
SINGLE-VALUE )
attributetype ( 1.3.6.1.4.1.7915.1.2.3.13 NAME 'objectdata'
- DESC 'Extraneous User Data'
+ DESC 'Extraneous binary user data'
SYNTAX 1.3.6.1.4.1.1466.115.121.1.40{65536}
SINGLE-VALUE )
objectclass ( 1.3.6.1.4.1.7915.1.2.4.1 NAME 'jetspeedgroup'
- DESC 'Jetspeed Group'
+ DESC 'Jetspeed group'
MUST ( groupname $ uid)
MAY ( members ) )
objectclass ( 1.3.6.1.4.1.7915.1.2.4.2 NAME 'jetspeedrole'
- DESC 'Jetspeed Role'
+ DESC 'Jetspeed role'
MUST ( rolename $ uid)
MAY (rolepermissions) )
objectclass ( 1.3.6.1.4.1.7915.1.2.4.3 NAME 'jetspeedpermission'
- DESC 'Jetspeed Permission'
+ DESC 'Jetspeed permission'
MUST ( permissionname $ uid) )
objectclass ( 1.3.6.1.4.1.7915.1.2.4.4 NAME 'jetspeeduser'
- DESC 'Jetspeed User'
+ DESC 'Jetspeed user'
MUST ( uid $ userPassword )
MAY ( mail $ name $ givenName $ sn $ uidnumber $ lastlogindate $ lastmodifieddate $ creationdate $ disabled $ objectdata $ confirm $ usergrouprole) )
objectclass ( 1.3.6.1.4.1.7915.1.2.4.5 NAME 'jetspeedpsml'
DESC 'Jetspeed PSML'
MUST ( uid )
MAY ( psml ) )
-
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org