ITS#5757

diff --git a/CHANGES b/CHANGES
index c10af5f0475923c2a7520caec722eeb27d1a9dd8..27343d928a4a1f4dae2c27a7584a6210a9e08427 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -12,6 +12,7 @@ OpenLDAP 2.4.13 Engineering
        Added slapd-bdb/hdb dbpagesize keyword
        Added slapd-bdb/hdb checksum keyword
        Fixed slapd-ldap snprintf buffer overflow test (ITS#4467)
+       Fixed slapd-null read controls support (ITS#5757)
        Fixed slapo-chain/translucent back-config support (ITS#5736)
        Fixed slapo-chain segv with search references (ITS#5742)
        Fixed slapo-collect compile with C89 (ITS#5747)

diff --git a/servers/slapd/back-null/null.c b/servers/slapd/back-null/null.c
index bc806987169f404e3f9d691389451961870247ed..b95eeadb81f215458cdb5aa6f0818690c63ed26b 100644 (file)
--- a/servers/slapd/back-null/null.c
+++ b/servers/slapd/back-null/null.c
@@ -184,6 +184,34 @@ null_back_db_destroy( Backend *be, ConfigReply *cr )
 int
 null_back_initialize( BackendInfo *bi )
 {
+       static char *controls[] = {
+               LDAP_CONTROL_ASSERT,
+               LDAP_CONTROL_MANAGEDSAIT,
+               LDAP_CONTROL_PAGEDRESULTS,
+               LDAP_CONTROL_SUBENTRIES,
+#if 0 /* do not declare support for write operation specific controls */
+               LDAP_CONTROL_NOOP,
+               LDAP_CONTROL_PRE_READ,
+               LDAP_CONTROL_POST_READ,
+               LDAP_CONTROL_X_PERMISSIVE_MODIFY,
+#ifdef LDAP_X_TXN
+               LDAP_CONTROL_X_TXN_SPEC,
+#endif
+#endif
+               NULL
+       };
+
+       Debug( LDAP_DEBUG_TRACE,
+               "null_back_initialize: initialize null backend\n", 0, 0, 0 );
+
+       bi->bi_flags |=
+               SLAP_BFLAG_INCREMENT |
+               SLAP_BFLAG_SUBENTRIES |
+               SLAP_BFLAG_ALIASES |
+               SLAP_BFLAG_REFERRALS;
+
+       bi->bi_controls = controls;
+
        bi->bi_open = 0;
        bi->bi_close = 0;
        bi->bi_config = 0;