From 33516fa9ebc375cf658eb9e76286f762da579548 Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Mon, 18 Feb 2002 20:06:50 +0000 Subject: [PATCH] #ifdef ACI/authpasswd schema --- servers/slapd/schema_init.c | 8 ++++++++ servers/slapd/slap.h | 3 +++ 2 files changed, 11 insertions(+) diff --git a/servers/slapd/schema_init.c b/servers/slapd/schema_init.c index e141a00c62..d8d82496b7 100644 --- a/servers/slapd/schema_init.c +++ b/servers/slapd/schema_init.c @@ -64,8 +64,12 @@ #define protocolInformationMatch NULL #define integerFirstComponentMatch NULL +#ifdef SLAPD_ACI_ENABLED #define OpenLDAPaciMatch NULL +#endif +#ifdef SLAPD_AUTHPASSWD #define authPasswordMatch NULL +#endif /* recycled indexing/filtering routines */ #define dnIndexer caseExactIgnoreIndexer @@ -4264,10 +4268,12 @@ static struct syntax_defs_rec { #endif /* OpenLDAP Experimental Syntaxes */ +#ifdef SLAPD_ACI_ENABLED {"( 1.3.6.1.4.1.4203.666.2.1 DESC 'OpenLDAP Experimental ACI' )", SLAP_SYNTAX_HIDE, UTF8StringValidate /* THIS WILL CHANGE FOR NEW ACI SYNTAX */, NULL, NULL}, +#endif #ifdef SLAPD_AUTHPASSWD /* needs updating */ @@ -4580,12 +4586,14 @@ static struct mrule_defs_rec { NULL}, #endif +#ifdef SLAPD_ACI_ENABLED {"( 1.3.6.1.4.1.4203.666.4.2 NAME 'OpenLDAPaciMatch' " "SYNTAX 1.3.6.1.4.1.4203.666.2.1 )", SLAP_MR_EQUALITY, NULL, NULL, OpenLDAPaciMatch, NULL, NULL, NULL}, +#endif {"( 1.2.840.113556.1.4.803 NAME 'integerBitAndMatch' " "SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 )", diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h index a1b22bb211..25f911049f 100644 --- a/servers/slapd/slap.h +++ b/servers/slapd/slap.h @@ -136,7 +136,10 @@ LDAP_BEGIN_DECL #define SLAPD_ROLE_ATTR "roleOccupant" #define SLAPD_ROLE_CLASS "organizationalRole" +#ifdef SLAPD_ACI_ENABLED #define SLAPD_ACI_SYNTAX "1.3.6.1.4.1.4203.666.2.1" +#endif + #define SLAPD_OCTETSTRING_SYNTAX "1.3.6.1.4.1.1466.115.121.1.40" /* change this to "OpenLDAPset" */ -- 2.39.5