Commit 33516fa9 authored by Kurt Zeilenga's avatar Kurt Zeilenga
Browse files

#ifdef ACI/authpasswd schema

parent 348e489b
...@@ -64,8 +64,12 @@ ...@@ -64,8 +64,12 @@
#define protocolInformationMatch NULL #define protocolInformationMatch NULL
#define integerFirstComponentMatch NULL #define integerFirstComponentMatch NULL
#ifdef SLAPD_ACI_ENABLED
#define OpenLDAPaciMatch NULL #define OpenLDAPaciMatch NULL
#endif
#ifdef SLAPD_AUTHPASSWD
#define authPasswordMatch NULL #define authPasswordMatch NULL
#endif
/* recycled indexing/filtering routines */ /* recycled indexing/filtering routines */
#define dnIndexer caseExactIgnoreIndexer #define dnIndexer caseExactIgnoreIndexer
...@@ -4264,10 +4268,12 @@ static struct syntax_defs_rec { ...@@ -4264,10 +4268,12 @@ static struct syntax_defs_rec {
#endif #endif
/* OpenLDAP Experimental Syntaxes */ /* OpenLDAP Experimental Syntaxes */
#ifdef SLAPD_ACI_ENABLED
{"( 1.3.6.1.4.1.4203.666.2.1 DESC 'OpenLDAP Experimental ACI' )", {"( 1.3.6.1.4.1.4203.666.2.1 DESC 'OpenLDAP Experimental ACI' )",
SLAP_SYNTAX_HIDE, SLAP_SYNTAX_HIDE,
UTF8StringValidate /* THIS WILL CHANGE FOR NEW ACI SYNTAX */, UTF8StringValidate /* THIS WILL CHANGE FOR NEW ACI SYNTAX */,
NULL, NULL}, NULL, NULL},
#endif
#ifdef SLAPD_AUTHPASSWD #ifdef SLAPD_AUTHPASSWD
/* needs updating */ /* needs updating */
...@@ -4580,12 +4586,14 @@ static struct mrule_defs_rec { ...@@ -4580,12 +4586,14 @@ static struct mrule_defs_rec {
NULL}, NULL},
#endif #endif
#ifdef SLAPD_ACI_ENABLED
{"( 1.3.6.1.4.1.4203.666.4.2 NAME 'OpenLDAPaciMatch' " {"( 1.3.6.1.4.1.4203.666.4.2 NAME 'OpenLDAPaciMatch' "
"SYNTAX 1.3.6.1.4.1.4203.666.2.1 )", "SYNTAX 1.3.6.1.4.1.4203.666.2.1 )",
SLAP_MR_EQUALITY, SLAP_MR_EQUALITY,
NULL, NULL, NULL, NULL,
OpenLDAPaciMatch, NULL, NULL, OpenLDAPaciMatch, NULL, NULL,
NULL}, NULL},
#endif
{"( 1.2.840.113556.1.4.803 NAME 'integerBitAndMatch' " {"( 1.2.840.113556.1.4.803 NAME 'integerBitAndMatch' "
"SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 )", "SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 )",
......
...@@ -136,7 +136,10 @@ LDAP_BEGIN_DECL ...@@ -136,7 +136,10 @@ LDAP_BEGIN_DECL
#define SLAPD_ROLE_ATTR "roleOccupant" #define SLAPD_ROLE_ATTR "roleOccupant"
#define SLAPD_ROLE_CLASS "organizationalRole" #define SLAPD_ROLE_CLASS "organizationalRole"
#ifdef SLAPD_ACI_ENABLED
#define SLAPD_ACI_SYNTAX "1.3.6.1.4.1.4203.666.2.1" #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" #define SLAPD_OCTETSTRING_SYNTAX "1.3.6.1.4.1.1466.115.121.1.40"
/* change this to "OpenLDAPset" */ /* change this to "OpenLDAPset" */
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment