[Date Prev][Date Next]
[Chronological]
[Thread]
[Top]
(ITS#6677) unregister_supported_control not under ifdef control
Full_Name: Douglas Leavitt
Version: HEAD
OS: OpenSolaris
URL: ftp://ftp.openldap.org/incoming/
Submission from: (NULL) (192.18.43.225)
The definition of unregister_supported_control is ifdef'd SLAP_CONFIG_DELETE
but one reference in sssvlv.c is not. Compiling HEAD in a non Devel
configuration
will cause link failures.
Suggested fix:
--- openldap/servers/slapd/overlays/sssvlv.c.bad Wed Oct 13 12:08:18 2010
+++ openldap/servers/slapd/overlays/sssvlv.c Thu Oct 14 23:32:31 2010
@@ -1183,12 +1183,12 @@
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 );
+#endif /* SLAP_CONFIG_DELETE */
return rc;
}
}
si = (sssvlv_info *)ch_malloc(sizeof(sssvlv_info));