From: Kurt Zeilenga <kurt@openldap.org>
Date: Thu, 15 Feb 2007 01:41:56 +0000 (+0000)
Subject: Fix C errors
X-Git-Tag: OPENLDAP_REL_ENG_2_4_4ALPHA^2~3
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=5953a397fce879b2eeaa9c770023ce883e83ee17;p=openldap

Fix C errors
---

diff --git a/servers/slapd/backglue.c b/servers/slapd/backglue.c
index 56b2f08ae6..58cdab69b6 100644
--- a/servers/slapd/backglue.c
+++ b/servers/slapd/backglue.c
@@ -621,9 +621,9 @@ glue_entry_get_rw (
 	int	rw,
 	Entry	**e )
 {
+	int rc;
 	BackendDB *b0 = op->o_bd;
 	op->o_bd = glue_back_select( b0, dn );
-	int rc;
 
 	if ( op->o_bd->be_fetch ) {
 		rc = op->o_bd->be_fetch( op, dn, oc, ad, rw, e );
diff --git a/servers/slapd/sasl.c b/servers/slapd/sasl.c
index b087343a56..7c02247dd6 100644
--- a/servers/slapd/sasl.c
+++ b/servers/slapd/sasl.c
@@ -1177,18 +1177,19 @@ static const rewrite_mapper slapd_mapper = {
 
 int slap_sasl_init( void )
 {
-
-#ifdef ENABLE_REWRITE
-	rewrite_mapper_register( &slapd_mapper );
-#endif
-
 #ifdef HAVE_CYRUS_SASL
 	int rc;
 	static sasl_callback_t server_callbacks[] = {
 		{ SASL_CB_LOG, &slap_sasl_log, NULL },
 		{ SASL_CB_LIST_END, NULL, NULL }
 	};
+#endif
 
+#ifdef ENABLE_REWRITE
+	rewrite_mapper_register( &slapd_mapper );
+#endif
+
+#ifdef HAVE_CYRUS_SASL
 #ifdef HAVE_SASL_VERSION
 	/* stringify the version number, sasl.h doesn't do it for us */
 #define	VSTR0(maj, min, pat)	#maj "." #min "." #pat