ldap/schema/01core389.ldif | 1 + ldap/servers/slapd/back-ldbm/init.c | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-)
New commits: commit 9cd075204d7d81a85835b5a42452c8467b0f3594 Author: Noriko Hosoi nhosoi@redhat.com Date: Wed Jun 8 14:57:49 2011 -0700
Bug 706179 - DS can not restart after create a new objectClass has entryusn attribute
https://bugzilla.redhat.com/show_bug.cgi?id=706179
Description: entryusn used to be dynamically added in the backend init, which occurred after the schema initialization. And it made the server's start-up fail when an objectclass contains entryusn as its attribute type. This patch adds entryusn to the schema file.
diff --git a/ldap/schema/01core389.ldif b/ldap/schema/01core389.ldif index 3402430..90ca5cb 100644 --- a/ldap/schema/01core389.ldif +++ b/ldap/schema/01core389.ldif @@ -126,6 +126,7 @@ attributeTypes: ( nsSSLActivation-oid NAME 'nsSSLActivation' DESC 'Netscape defi attributeTypes: ( 2.16.840.1.113730.3.1.2091 NAME 'nsslapd-suffix' DESC 'Netscape defined attribute type' SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 X-ORIGIN 'Netscape' ) attributeTypes: ( 2.16.840.1.113730.3.1.2092 NAME 'nsslapd-ldapiautodnsuffix' DESC 'Netscape defined attribute type' SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 X-ORIGIN 'Netscape' ) attributeTypes: ( 2.16.840.1.113730.3.1.2095 NAME 'connection' DESC 'Netscape defined attribute type' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 X-ORIGIN 'Netscape' ) +attributeTypes: ( 2.16.840.1.113730.3.1.2096 NAME 'entryusn' DESC 'Netscape defined attribute type' SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE NO-USER-MODIFICATION USAGE directoryOperation X-ORIGIN 'Netscape' ) # # objectclasses # diff --git a/ldap/servers/slapd/back-ldbm/init.c b/ldap/servers/slapd/back-ldbm/init.c index a904b9c..b41faba 100644 --- a/ldap/servers/slapd/back-ldbm/init.c +++ b/ldap/servers/slapd/back-ldbm/init.c @@ -85,10 +85,6 @@ ldbm_back_add_schema( Slapi_PBlock *pb ) LDBM_ENTRYID_OID, DIRSTRING_SYNTAX_OID, CASEIGNOREMATCH_NAME, SLAPI_ATTR_FLAG_SINGLE );
- rc |= add_ldbm_internal_attr_syntax( SLAPI_ATTR_ENTRYUSN, - LDBM_ENTRYUSN_OID, INTEGER_SYNTAX_OID, INTFIRSTCOMPMATCH_NAME, - SLAPI_ATTR_FLAG_SINGLE|SLAPI_ATTR_FLAG_NOUSERMOD ); - return rc; }
389-commits@lists.fedoraproject.org