Remove HEAD only bits

diff --git a/contrib/slapd-modules/noopsrch/noopsrch.c b/contrib/slapd-modules/noopsrch/noopsrch.c
index eda65115cea02f3efb61de99c51bd2122b2bbf9a..39c785c4d019a62f5049b2191b2c26f8b7b6ed84 100644 (file)
--- a/contrib/slapd-modules/noopsrch/noopsrch.c
+++ b/contrib/slapd-modules/noopsrch/noopsrch.c
@@ -219,12 +219,12 @@ noopsrch_db_destroy( BackendDB *be, ConfigReply *cr )
 
 #ifdef SLAP_CONFIG_DELETE
        overlay_unregister_control( be, LDAP_CONTROL_X_NOOPSRCH );
-#endif /* SLAP_CONFIG_DELETE */
-
        if ( --noopsrch_cnt == 0 ) {
                unregister_supported_control( LDAP_CONTROL_X_NOOPSRCH );
        }
 
+#endif /* SLAP_CONFIG_DELETE */
+
        return 0;
 }
 

diff --git a/servers/slapd/overlays/sssvlv.c b/servers/slapd/overlays/sssvlv.c
index 0bef102d638456aaaa97c7088accaa043cbfe7d9..d7e01229a39a379f52da0bd3a3c3d6322622fee0 100644 (file)
--- a/servers/slapd/overlays/sssvlv.c
+++ b/servers/slapd/overlays/sssvlv.c
@@ -1276,10 +1276,6 @@ static int sssvlv_db_init(
                if ( rc != LDAP_SUCCESS ) {
                        Debug( LDAP_DEBUG_ANY, "Failed to register VLV Request control '%s' (%d)\n",
                                LDAP_CONTROL_VLVREQUEST, rc, 0 );
-#ifdef SLAP_CONFIG_DELETE
-                       overlay_unregister_control( be, LDAP_CONTROL_SORTREQUEST );
-#endif /* SLAP_CONFIG_DELETE */
-                       unregister_supported_control( LDAP_CONTROL_SORTREQUEST );
                        return rc;
                }
        }
@@ -1315,10 +1311,6 @@ static int sssvlv_db_destroy(
                ldap_pvt_thread_mutex_destroy( &sort_conns_mutex );
        }
 
-       if ( ov_count == 0 ) {
-               unregister_supported_control( LDAP_CONTROL_SORTREQUEST );
-       }
-       
        if ( si ) {
                ch_free( si );
                on->on_bi.bi_private = NULL;