Added slap_null_cb

diff --git a/servers/slapd/proto-slap.h b/servers/slapd/proto-slap.h
index 129445bbafbcd7a9f546fe1d9575cdb701ce01bc..59712f87dcf2702c464d28cb72bbc4741dc104b8 100644 (file)
--- a/servers/slapd/proto-slap.h
+++ b/servers/slapd/proto-slap.h
@@ -919,6 +919,7 @@ LDAP_SLAPD_F (void) slap_send_ldap_intermediate LDAP_P(( Operation *op, SlapRepl
 LDAP_SLAPD_F (void) slap_send_search_result LDAP_P(( Operation *op, SlapReply *rs ));
 LDAP_SLAPD_F (int) slap_send_search_reference LDAP_P(( Operation *op, SlapReply *rs ));
 LDAP_SLAPD_F (int) slap_send_search_entry LDAP_P(( Operation *op, SlapReply *rs ));
+LDAP_SLAPD_F (int) slap_null_cb LDAP_P(( Operation *op, SlapReply *rs ));
 
 LDAP_SLAPD_V( const struct berval ) slap_pre_read_bv;
 LDAP_SLAPD_V( const struct berval ) slap_post_read_bv;

diff --git a/servers/slapd/result.c b/servers/slapd/result.c
index b765a7637f09e053f51e90b7357d259ce2fa034d..07b8d2d904e85903dcf497ac7bcc51e908ee5efb 100644 (file)
--- a/servers/slapd/result.c
+++ b/servers/slapd/result.c
@@ -41,6 +41,11 @@
 #include "slapi.h"
 #endif
 
+int slap_null_cb( Operation *op, SlapReply *rs )
+{
+       return 0;
+}
+
 static char *v2ref( BerVarray ref, const char *text )
 {
        size_t len = 0, i = 0;

diff --git a/servers/slapd/sasl.c b/servers/slapd/sasl.c
index 6c9378f954970e77ac60d7c8e881b7be7ac4c168..f973098617c29da2d0a0d4aa90ff124528fa3492 100644 (file)
--- a/servers/slapd/sasl.c
+++ b/servers/slapd/sasl.c
@@ -323,7 +323,7 @@ typedef struct lookup_info {
        sasl_server_params_t *sparams;
 } lookup_info;
 
-static slap_response sasl_ap_lookup, sasl_ap_store, sasl_cb_checkpass;
+static slap_response sasl_ap_lookup, sasl_cb_checkpass;
 
 static int
 sasl_ap_lookup( Operation *op, SlapReply *rs )
@@ -473,12 +473,6 @@ slap_auxprop_lookup(
 }
 
 #if SASL_VERSION_FULL >= 0x020110
-static int
-sasl_ap_store( Operation *op, SlapReply *rs )
-{
-       return 0;
-}
-
 static int
 slap_auxprop_store(
        void *glob_context,
@@ -493,7 +487,7 @@ slap_auxprop_store(
        Connection *conn = NULL;
        const struct propval *pr;
        Modifications *modlist = NULL, **modtail = &modlist, *mod;
-       slap_callback cb = { sasl_ap_store, NULL };
+       slap_callback cb = { slap_null_cb, NULL };
        char textbuf[SLAP_TEXT_BUFLEN];
        const char *text;
        size_t textlen = sizeof(textbuf);