From: Kurt Zeilenga Date: Tue, 5 Sep 2000 20:43:54 +0000 (+0000) Subject: Import name and optional UID syntax routines X-Git-Tag: OPENLDAP_REL_ENG_2_0_1~6 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=cae203088783939b133f4da6d97fea84e8ac0b4a;p=openldap Import name and optional UID syntax routines --- diff --git a/CHANGES b/CHANGES index 01252f8a54..0040f6923d 100644 --- a/CHANGES +++ b/CHANGES @@ -1,12 +1,14 @@ OpenLDAP 2.0 Change Log OpenLDAP 2.0.X Engineering - Fixed StartTLS & ldaps:// client SDK and command usage + Fixed StartTLS & ldaps:// client SDK Fixed slapd session close deadlock (ITS#704) Fixed slapd SSF ACLs Updated slapd MAXARGS to 200 Updated slapd nisNetgroupTriple validation routine (ITS#705) Updated slapd bootParameter validation routine (ITS#706) + Updated slapd nameUID syntax to reuse DN routines + Updated client tool usage (ITS#710) Build Environment Fixed MSC tcp_close redefine Documentation diff --git a/servers/slapd/schema_init.c b/servers/slapd/schema_init.c index 4b63b38e8c..715c1fd2b5 100644 --- a/servers/slapd/schema_init.c +++ b/servers/slapd/schema_init.c @@ -19,6 +19,7 @@ /* recycled validatation routines */ #define berValidate blobValidate +#define nameUIDValidate dnValidate /* unimplemented validators */ #define bitStringValidate NULL @@ -28,6 +29,7 @@ #define phoneNumberNormalize numericStringNormalize #define telexNumberNormalize numericStringNormalize #define integerNormalize numericStringNormalize +#define nameUIDNormalize dnNormalize /* unimplemented normalizers */ #define bitStringNormalize NULL @@ -36,6 +38,9 @@ #define dnPretty NULL #define integerPretty NULL +/* recycled pretters */ +#define nameUIDPretty dnPretty + /* recycled matching routines */ #define caseIgnoreMatch caseIgnoreIA5Match #define caseIgnoreOrderingMatch caseIgnoreMatch @@ -2348,7 +2353,7 @@ struct syntax_defs_rec syntax_defs[] = { {"( 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.34 DESC 'Name And Optional UID' )", - 0, NULL, NULL, NULL}, + 0, nameUIDValidate, nameUIDNormalize, nameUIDPretty}, {"( 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.36 DESC 'Numeric String' )",