You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ak...@apache.org on 2008/03/31 18:14:54 UTC
svn commit: r643042 - in
/directory/apacheds/branches/bigbang/schema-extras/src/main/schema:
autofs.schema nis.schema
Author: akarasulu
Date: Mon Mar 31 09:14:45 2008
New Revision: 643042
URL: http://svn.apache.org/viewvc?rev=643042&view=rev
Log:
fix for DIRSERVER-990: updated nis and autofs schemas
Modified:
directory/apacheds/branches/bigbang/schema-extras/src/main/schema/autofs.schema
directory/apacheds/branches/bigbang/schema-extras/src/main/schema/nis.schema
Modified: directory/apacheds/branches/bigbang/schema-extras/src/main/schema/autofs.schema
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/schema-extras/src/main/schema/autofs.schema?rev=643042&r1=643041&r2=643042&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/schema-extras/src/main/schema/autofs.schema (original)
+++ directory/apacheds/branches/bigbang/schema-extras/src/main/schema/autofs.schema Mon Mar 31 09:14:45 2008
@@ -8,13 +8,13 @@
# Attribute Type Definitions
-attributetype ( 1.3.6.1.1.1.1.25 NAME 'automountInformation'
+attributetype ( 1.3.6.1.4.1.2312.4.1.2 NAME 'automountInformation'
DESC 'Information used by the autofs automounter'
- EQUALITY caseExactIA5Match
+ EQUALITY caseExactMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
# malformed: superior top and class type STRUCTURAL were in front of DESC
-objectclass ( 1.3.6.1.1.1.1.13 NAME 'automount'
+objectclass ( 1.3.6.1.4.1.2312.4.2.3 NAME 'automount'
DESC 'An entry in an automounter map'
SUP top STRUCTURAL
MUST ( cn $ automountInformation )
Modified: directory/apacheds/branches/bigbang/schema-extras/src/main/schema/nis.schema
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/schema-extras/src/main/schema/nis.schema?rev=643042&r1=643041&r2=643042&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/schema-extras/src/main/schema/nis.schema (original)
+++ directory/apacheds/branches/bigbang/schema-extras/src/main/schema/nis.schema Mon Mar 31 09:14:45 2008
@@ -1,4 +1,17 @@
-# $OpenLDAP: pkg/ldap/servers/slapd/schema/nis.schema,v 1.8 2001/12/07 23:36:11 kurt Exp $
+# $OpenLDAP: /servers/slapd/schema/nis.schema,v 1.15.2.3 2008/02/11 23:26:49 kurt Exp $
+## This work is part of OpenLDAP Software <http://www.openldap.org/>.
+##
+## Copyright 1998-2008 The OpenLDAP Foundation.
+## All rights reserved.
+##
+## Redistribution and use in source and binary forms, with or without
+## modification, are permitted only as authorized by the OpenLDAP
+## Public License.
+##
+## A copy of this license is available in the file LICENSE in the
+## top-level directory of the distribution or, alternatively, at
+## <http://www.OpenLDAP.org/license.html>.
+
# Definitions from RFC2307 (Experimental)
# An Approach for Using LDAP as a Network Information Service
@@ -143,14 +156,12 @@
# Object Class Definitions
-# malformed: SUP and AUXILIARY were before DESC
objectclass ( 1.3.6.1.1.1.2.0 NAME 'posixAccount'
DESC 'Abstraction of an account with POSIX attributes'
SUP top AUXILIARY
MUST ( cn $ uid $ uidNumber $ gidNumber $ homeDirectory )
MAY ( userPassword $ loginShell $ gecos $ description ) )
-# malformed: SUP and AUXILIARY were before DESC
objectclass ( 1.3.6.1.1.1.2.1 NAME 'shadowAccount'
DESC 'Additional attributes for shadow passwords'
SUP top AUXILIARY
@@ -159,76 +170,65 @@
shadowMax $ shadowWarning $ shadowInactive $
shadowExpire $ shadowFlag $ description ) )
-# malformed: SUP top STRUCTURAL was before DESC
objectclass ( 1.3.6.1.1.1.2.2 NAME 'posixGroup'
DESC 'Abstraction of a group of accounts'
SUP top STRUCTURAL
MUST ( cn $ gidNumber )
MAY ( userPassword $ memberUid $ description ) )
-# malformed: SUP top STRUCTURAL was before DESC
objectclass ( 1.3.6.1.1.1.2.3 NAME 'ipService'
DESC 'Abstraction an Internet Protocol service'
SUP top STRUCTURAL
MUST ( cn $ ipServicePort $ ipServiceProtocol )
MAY ( description ) )
-# malformed: SUP top STRUCTURAL was before DESC
objectclass ( 1.3.6.1.1.1.2.4 NAME 'ipProtocol'
DESC 'Abstraction of an IP protocol'
- SUP top STRUCTURAL
+ SUP top STRUCTURAL
MUST ( cn $ ipProtocolNumber $ description )
MAY description )
-# malformed: SUP top STRUCTURAL was before DESC
objectclass ( 1.3.6.1.1.1.2.5 NAME 'oncRpc'
DESC 'Abstraction of an ONC/RPC binding'
- SUP top STRUCTURAL
+ SUP top STRUCTURAL
MUST ( cn $ oncRpcNumber $ description )
MAY description )
-# malformed: SUP top AUXILIARY was before DESC
objectclass ( 1.3.6.1.1.1.2.6 NAME 'ipHost'
DESC 'Abstraction of a host, an IP device'
SUP top AUXILIARY
MUST ( cn $ ipHostNumber )
MAY ( l $ description $ manager ) )
-# malformed: SUP top STRUCTURAL was before DESC
objectclass ( 1.3.6.1.1.1.2.7 NAME 'ipNetwork'
DESC 'Abstraction of an IP network'
SUP top STRUCTURAL
MUST ( cn $ ipNetworkNumber )
MAY ( ipNetmaskNumber $ l $ description $ manager ) )
-# malformed: SUP top STRUCTURAL was before DESC
objectclass ( 1.3.6.1.1.1.2.8 NAME 'nisNetgroup'
DESC 'Abstraction of a netgroup'
SUP top STRUCTURAL
MUST cn
MAY ( nisNetgroupTriple $ memberNisNetgroup $ description ) )
-# malformed: SUP top STRUCTURAL was before DESC
objectclass ( 1.3.6.1.1.1.2.9 NAME 'nisMap'
DESC 'A generic abstraction of a NIS map'
SUP top STRUCTURAL
MUST nisMapName
MAY description )
-# malformed: SUP top STRUCTURAL was before DESC
objectclass ( 1.3.6.1.1.1.2.10 NAME 'nisObject'
DESC 'An entry in a NIS map'
SUP top STRUCTURAL
MUST ( cn $ nisMapEntry $ nisMapName )
MAY description )
-# malformed: SUP top AUXILIARY was before DESC
objectclass ( 1.3.6.1.1.1.2.11 NAME 'ieee802Device'
DESC 'A device with a MAC address'
SUP top AUXILIARY
MAY macAddress )
-# malformed: SUP top AUXILIARY was before DESC
objectclass ( 1.3.6.1.1.1.2.12 NAME 'bootableDevice'
DESC 'A device with boot parameters'
SUP top AUXILIARY