ITS#6098

diff --git a/CHANGES b/CHANGES
index 386df8fcedf92ce42f8b1d55e7481fc8b08a5fbf..221ff927d994d072e94bbe9a9a4b3e77ec679fb0 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,7 @@ OpenLDAP 2.4.17 Engineering
        Fixed libldap tls NULL error messages (ITS#6079)
        Fixed liblutil opendir/closedir on windows (ITS#6041)
        Fixed liblutil for _GNU_SOURCE (ITS#5464,ITS#5666)
+       Fixed slapd cert validation (ITS#6098)
        Fixed slapd errno handling (ITS#6037)
        Fixed slapd global alloc handling (ITS#6054)
        Fixed slapd moduleload with static backends and modules (ITS#6016)

diff --git a/servers/slapd/schema_init.c b/servers/slapd/schema_init.c
index 85c62249df2d1b343c86de464ee3ec6174470023..7ddcbc45d492398464b34eab0ef6cb120785d880 100644 (file)
--- a/servers/slapd/schema_init.c
+++ b/servers/slapd/schema_init.c
@@ -156,8 +156,8 @@ enum {
 
 enum {
        SLAP_X509_OPT_C_VERSION         = SLAP_X509_OPTION + 0,
-       SLAP_X509_OPT_C_ISSUERUNIQUEID  = SLAP_X509_OPTION + 1,
-       SLAP_X509_OPT_C_SUBJECTUNIQUEID = SLAP_X509_OPTION + 2,
+       SLAP_X509_OPT_C_ISSUERUNIQUEID  = LBER_CLASS_CONTEXT + 1,
+       SLAP_X509_OPT_C_SUBJECTUNIQUEID = LBER_CLASS_CONTEXT + 2,
        SLAP_X509_OPT_C_EXTENSIONS      = SLAP_X509_OPTION + 3
 };