#ifdef ACI/authpasswd schema

diff --git a/servers/slapd/schema_init.c b/servers/slapd/schema_init.c
index e141a00c627bd8bb9b58763e2926f8f43ffc2318..d8d82496b7e3d6651f36025ffe138842a18f1ec4 100644 (file)
--- 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 a1b22bb2111b72be24500dfa58b0d494edad4716..25f911049fae36b21154fd063b3b7014481ef9aa 100644 (file)
--- 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" */