From ce11612e9b04f3e25bb2a84214d1b425f383ac69 Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Mon, 12 Jul 2010 03:17:02 +0000 Subject: [PATCH] Add SLAP_SYNTAX_DN syntax flag --- servers/slapd/schema_init.c | 4 ++-- servers/slapd/slap.h | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/servers/slapd/schema_init.c b/servers/slapd/schema_init.c index 82ff09d06d..df805dbffc 100644 --- a/servers/slapd/schema_init.c +++ b/servers/slapd/schema_init.c @@ -6058,7 +6058,7 @@ static slap_syntax_defs_rec syntax_defs[] = { countryStringValidate, NULL}, #endif {"( 1.3.6.1.4.1.1466.115.121.1.12 DESC 'Distinguished Name' )", - 0, NULL, dnValidate, dnPretty}, + SLAP_SYNTAX_DN, NULL, dnValidate, dnPretty}, {"( 1.2.36.79672281.1.5.0 DESC 'RDN' )", 0, NULL, rdnValidate, rdnPretty}, #ifdef LDAP_COMP_MATCH @@ -6108,7 +6108,7 @@ static slap_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, nameUIDValidate, nameUIDPretty }, + SLAP_SYNTAX_DN, NULL, nameUIDValidate, 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' )", diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h index 2e7d0b28e4..81ceca8655 100644 --- a/servers/slapd/slap.h +++ b/servers/slapd/slap.h @@ -422,6 +422,7 @@ struct Syntax { #define SLAP_SYNTAX_HIDE 0x8000U /* hide (do not publish) */ #endif #define SLAP_SYNTAX_HARDCODE 0x10000U /* This is hardcoded schema */ +#define SLAP_SYNTAX_DN 0x20000U /* Treat like a DN */ Syntax **ssyn_sups; -- 2.39.5