From: Kurt Zeilenga Date: Wed, 17 May 2000 18:10:38 +0000 (+0000) Subject: Add missing syntaxes from RFC 2252. X-Git-Tag: LDBM_PRE_GIANT_RWLOCK~2927 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=75b51d523f4cbd36accaf15f0afbbedfc6c75e1a;p=openldap Add missing syntaxes from RFC 2252. --- diff --git a/servers/slapd/schema_init.c b/servers/slapd/schema_init.c index af614ae76c..abbdfc8caa 100644 --- a/servers/slapd/schema_init.c +++ b/servers/slapd/schema_init.c @@ -270,101 +270,115 @@ struct syntax_defs_rec { }; struct syntax_defs_rec syntax_defs[] = { - {"( 1.3.6.1.4.1.1466.115.121.1.3 DESC 'AttributeTypeDescription' )", + {"( 1.3.6.1.4.1.1466.115.121.1.1 DESC 'ACI Item' )", + SLAP_SYNTAX_BINARY, NULL, NULL, NULL}, + {"( 1.3.6.1.4.1.1466.115.121.1.2 DESC 'Access Point' )", + SLAP_SYNTAX_BINARY, NULL, NULL, NULL}, + {"( 1.3.6.1.4.1.1466.115.121.1.3 DESC 'Attribute Type Description' )", 0, NULL, NULL, NULL}, {"( 1.3.6.1.4.1.1466.115.121.1.4 DESC 'Audio' )", - 0, NULL, NULL, NULL}, + SLAP_SYNTAX_BINARY, NULL, NULL, NULL}, {"( 1.3.6.1.4.1.1466.115.121.1.5 DESC 'Binary' )", - SLAP_SYNTAX_BINARY, - NULL, NULL, NULL}, - {"( 1.3.6.1.4.1.1466.115.121.1.6 DESC 'BitString' )", + SLAP_SYNTAX_BINARY, NULL, NULL, NULL}, + {"( 1.3.6.1.4.1.1466.115.121.1.6 DESC 'Bit String' )", 0, NULL, NULL, NULL}, {"( 1.3.6.1.4.1.1466.115.121.1.7 DESC 'Boolean' )", 0, NULL, NULL, NULL}, {"( 1.3.6.1.4.1.1466.115.121.1.8 DESC 'Certificate' )", - SLAP_SYNTAX_BINARY, - NULL, NULL, NULL}, - {"( 1.3.6.1.4.1.1466.115.121.1.9 DESC 'CertificateList' )", - SLAP_SYNTAX_BINARY, - NULL, NULL, NULL}, - {"( 1.3.6.1.4.1.1466.115.121.1.10 DESC 'CertificatePair' )", - SLAP_SYNTAX_BINARY, - NULL, NULL, NULL}, + SLAP_SYNTAX_BINARY, NULL, NULL, NULL}, + {"( 1.3.6.1.4.1.1466.115.121.1.9 DESC 'Certificate List' )", + SLAP_SYNTAX_BINARY, NULL, NULL, NULL}, + {"( 1.3.6.1.4.1.1466.115.121.1.10 DESC 'Certificate Pair' )", + SLAP_SYNTAX_BINARY, NULL, NULL, NULL}, + {"( 1.3.6.1.4.1.1466.115.121.1.11 DESC 'Country String' )", + 0, NULL, NULL, NULL}, {"( 1.3.6.1.4.1.1466.115.121.1.12 DESC 'DN' )", 0, NULL, NULL, NULL}, - {"( 1.3.6.1.4.1.1466.115.121.1.13 DESC 'DataQuality' )", + {"( 1.3.6.1.4.1.1466.115.121.1.13 DESC 'Data Quality' )", 0, NULL, NULL, NULL}, - {"( 1.3.6.1.4.1.1466.115.121.1.14 DESC 'DeliveryMethod' )", + {"( 1.3.6.1.4.1.1466.115.121.1.14 DESC 'Delivery Method' )", 0, NULL, NULL, NULL}, - {"( 1.3.6.1.4.1.1466.115.121.1.15 DESC 'DirectoryString' )", + {"( 1.3.6.1.4.1.1466.115.121.1.15 DESC 'Directory String' )", 0, UTF8StringValidate, NULL, NULL}, - {"( 1.3.6.1.4.1.1466.115.121.1.16 DESC 'DITContentRuleDescription' )", + {"( 1.3.6.1.4.1.1466.115.121.1.16 DESC 'DIT Content Rule Description' )", 0, NULL, NULL, NULL}, - {"( 1.3.6.1.4.1.1466.115.121.1.17 DESC 'DITStructureRuleDescription' )", + {"( 1.3.6.1.4.1.1466.115.121.1.17 DESC 'DIT Structure Rule Description' )", 0, NULL, NULL, NULL}, - {"( 1.3.6.1.4.1.1466.115.121.1.19 DESC 'DSAQuality' )", + {"( 1.3.6.1.4.1.1466.115.121.1.19 DESC 'DSA Quality' )", 0, NULL, NULL, NULL}, - {"( 1.3.6.1.4.1.1466.115.121.1.21 DESC 'EnhancedGuide' )", + {"( 1.3.6.1.4.1.1466.115.121.1.20 DESC 'DSE Type' )", 0, NULL, NULL, NULL}, - {"( 1.3.6.1.4.1.1466.115.121.1.22 DESC 'FacsimileTelephoneNumber' )", + {"( 1.3.6.1.4.1.1466.115.121.1.21 DESC 'Enhanced Guide' )", 0, NULL, NULL, NULL}, - {"( 1.3.6.1.4.1.1466.115.121.1.23 DESC 'Fax' )", + {"( 1.3.6.1.4.1.1466.115.121.1.22 DESC 'Facsimile Telephone Number' )", 0, NULL, NULL, NULL}, - {"( 1.3.6.1.4.1.1466.115.121.1.24 DESC 'GeneralizedTime' )", + {"( 1.3.6.1.4.1.1466.115.121.1.23 DESC 'Fax' )", + SLAP_SYNTAX_BINARY, NULL, NULL, NULL}, + {"( 1.3.6.1.4.1.1466.115.121.1.24 DESC 'Generalized Time' )", 0, NULL, NULL, NULL}, {"( 1.3.6.1.4.1.1466.115.121.1.25 DESC 'Guide' )", 0, NULL, NULL, NULL}, - {"( 1.3.6.1.4.1.1466.115.121.1.26 DESC 'IA5String' )", + {"( 1.3.6.1.4.1.1466.115.121.1.26 DESC 'IA5 String' )", 0, IA5StringValidate, NULL, NULL}, {"( 1.3.6.1.4.1.1466.115.121.1.27 DESC 'Integer' )", 0, NULL, NULL, NULL}, {"( 1.3.6.1.4.1.1466.115.121.1.28 DESC 'JPEG' )", + SLAP_SYNTAX_BINARY, NULL, NULL, NULL}, + {"( 1.3.6.1.4.1.1466.115.121.1.29 DESC 'Master And Shadow Access Points' )", 0, NULL, NULL, NULL}, - {"( 1.3.6.1.4.1.1466.115.121.1.30 DESC 'MatchingRuleDescription' )", + {"( 1.3.6.1.4.1.1466.115.121.1.30 DESC 'Matching Rule Description' )", 0, NULL, NULL, NULL}, - {"( 1.3.6.1.4.1.1466.115.121.1.31 DESC 'MatchingRuleUseDescription' )", + {"( 1.3.6.1.4.1.1466.115.121.1.31 DESC 'Matching Rule Use Description' )", 0, NULL, NULL, NULL}, - {"( 1.3.6.1.4.1.1466.115.121.1.32 DESC 'MailPreference' )", + {"( 1.3.6.1.4.1.1466.115.121.1.32 DESC 'Mail Preference' )", 0, NULL, NULL, NULL}, - {"( 1.3.6.1.4.1.1466.115.121.1.34 DESC 'NameAndOptionalUID' )", + {"( 1.3.6.1.4.1.1466.115.121.1.33 DESC 'MHS OR Address' )", 0, NULL, NULL, NULL}, - {"( 1.3.6.1.4.1.1466.115.121.1.35 DESC 'NameFormDescription' )", + {"( 1.3.6.1.4.1.1466.115.121.1.34 DESC 'Name And Optional UID' )", 0, NULL, NULL, NULL}, - {"( 1.3.6.1.4.1.1466.115.121.1.36 DESC 'NumericString' )", + {"( 1.3.6.1.4.1.1466.115.121.1.35 DESC 'Name Form Description' )", 0, NULL, NULL, NULL}, - {"( 1.3.6.1.4.1.1466.115.121.1.37 DESC 'ObjectClassDescription' )", + {"( 1.3.6.1.4.1.1466.115.121.1.36 DESC 'Numeric String' )", + 0, NULL, NULL, NULL}, + {"( 1.3.6.1.4.1.1466.115.121.1.37 DESC 'Object Class Description' )", 0, NULL, NULL, NULL}, {"( 1.3.6.1.4.1.1466.115.121.1.38 DESC 'OID' )", 0, NULL, NULL, NULL}, - {"( 1.3.6.1.4.1.1466.115.121.1.39 DESC 'OtherMailbox' )", + {"( 1.3.6.1.4.1.1466.115.121.1.39 DESC 'Other Mailbox' )", 0, NULL, NULL, NULL}, - {"( 1.3.6.1.4.1.1466.115.121.1.40 DESC 'OctetString' )", + {"( 1.3.6.1.4.1.1466.115.121.1.40 DESC 'Octet String' )", 0, octetStringValidate, NULL, NULL}, - {"( 1.3.6.1.4.1.1466.115.121.1.41 DESC 'PostalAddress' )", + {"( 1.3.6.1.4.1.1466.115.121.1.41 DESC 'Postal Address' )", 0, NULL, NULL, NULL}, - {"( 1.3.6.1.4.1.1466.115.121.1.42 DESC 'ProtocolInformation' )", + {"( 1.3.6.1.4.1.1466.115.121.1.42 DESC 'Protocol Information' )", 0, NULL, NULL, NULL}, - {"( 1.3.6.1.4.1.1466.115.121.1.43 DESC 'PresentationAddress' )", + {"( 1.3.6.1.4.1.1466.115.121.1.43 DESC 'Presentation Address' )", 0, NULL, NULL, NULL}, - {"( 1.3.6.1.4.1.1466.115.121.1.44 DESC 'PrintableString' )", + {"( 1.3.6.1.4.1.1466.115.121.1.44 DESC 'Printable String' )", 0, NULL, NULL, NULL}, - {"( 1.3.6.1.4.1.1466.115.121.1.49 DESC 'SupportedAlgorithm' )", + {"( 1.3.6.1.4.1.1466.115.121.1.49 DESC 'Supported Algorithm' )", SLAP_SYNTAX_BINARY, NULL, NULL, NULL}, - {"( 1.3.6.1.4.1.1466.115.121.1.50 DESC 'TelephoneNumber' )", + {"( 1.3.6.1.4.1.1466.115.121.1.50 DESC 'Telephone Number' )", + 0, NULL, NULL, NULL}, + {"( 1.3.6.1.4.1.1466.115.121.1.51 DESC 'Teletex Terminal Identifier' )", + 0, NULL, NULL, NULL}, + {"( 1.3.6.1.4.1.1466.115.121.1.52 DESC 'Telex Number' )", + 0, NULL, NULL, NULL}, + {"( 1.3.6.1.4.1.1466.115.121.1.53 DESC 'UTC Time' )", 0, NULL, NULL, NULL}, - {"( 1.3.6.1.4.1.1466.115.121.1.51 DESC 'TeletexTerminalIdentifier' )", + {"( 1.3.6.1.4.1.1466.115.121.1.54 DESC 'LDAP Syntax Description' )", 0, NULL, NULL, NULL}, - {"( 1.3.6.1.4.1.1466.115.121.1.52 DESC 'TelexNumber' )", + {"( 1.3.6.1.4.1.1466.115.121.1.55 DESC 'Modify Rights' )", 0, NULL, NULL, NULL}, - {"( 1.3.6.1.4.1.1466.115.121.1.53 DESC 'UTCTime' )", + {"( 1.3.6.1.4.1.1466.115.121.1.56 DESC 'LDAP Schema Definition' )", 0, NULL, NULL, NULL}, - {"( 1.3.6.1.4.1.1466.115.121.1.54 DESC 'LDAPSyntaxDescription' )", + {"( 1.3.6.1.4.1.1466.115.121.1.57 DESC 'LDAP Schema Description' )", 0, NULL, NULL, NULL}, - {"( 1.3.6.1.4.1.1466.115.121.1.58 DESC 'SubstringAssertion' )", + {"( 1.3.6.1.4.1.1466.115.121.1.58 DESC 'Substring Assertion' )", 0, NULL, NULL, NULL}, /* OpenLDAP Experimental Syntaxes */ - {"( " SLAPD_OID_ACI_SYNTAX " DESC 'OpenLDAPexperimentalACI' )", + {"( " SLAPD_OID_ACI_SYNTAX " DESC 'OpenLDAP Experimental ACI' )", 0, NULL, NULL, NULL}, {NULL, 0, NULL, NULL, NULL}