From f830b0b62ab43057ad99a5da3b59c2fc5e17e418 Mon Sep 17 00:00:00 2001 From: Quanah Gibson-Mount Date: Wed, 5 Jan 2011 00:18:50 +0000 Subject: [PATCH] Remove HEAD only bits --- contrib/slapd-modules/noopsrch/noopsrch.c | 4 ++-- servers/slapd/overlays/sssvlv.c | 8 -------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/contrib/slapd-modules/noopsrch/noopsrch.c b/contrib/slapd-modules/noopsrch/noopsrch.c index eda65115ce..39c785c4d0 100644 --- 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 0bef102d63..d7e01229a3 100644 --- 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; -- 2.39.5