From: Pierangelo Masarati <ando@openldap.org>
Date: Mon, 11 Apr 2005 21:35:34 +0000 (+0000)
Subject: cleanup & silence warnings
X-Git-Tag: OPENLDAP_AC_BP~927
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=91b4e991be3728d9c6ac4d7c5a98ecdf745e3fd9;p=openldap

cleanup & silence warnings
---

diff --git a/servers/slapd/acl.c b/servers/slapd/acl.c
index 7404cda5b0..3bcd3065c6 100644
--- a/servers/slapd/acl.c
+++ b/servers/slapd/acl.c
@@ -54,7 +54,9 @@ static struct berval
 	aci_bv_br_entry		= BER_BVC("[entry]"),
 	aci_bv_br_all		= BER_BVC("[all]"),
 	aci_bv_access_id 	= BER_BVC("access-id"),
+#if 0
 	aci_bv_anonymous	= BER_BVC("anonymous"),
+#endif
 	aci_bv_public		= BER_BVC("public"),
 	aci_bv_users		= BER_BVC("users"),
 	aci_bv_self 		= BER_BVC("self"),
@@ -69,7 +71,9 @@ static struct berval
 	aci_bv_ip_eq		= BER_BVC("IP="),
 #ifdef LDAP_PF_LOCAL
 	aci_bv_path_eq		= BER_BVC("PATH="),
+#if 0
 	aci_bv_dirsep		= BER_BVC(LDAP_DIRSEP),
+#endif
 #endif /* LDAP_PF_LOCAL */
 	
 	aci_bv_group_class 	= BER_BVC(SLAPD_GROUP_CLASS),
@@ -280,7 +284,7 @@ access_allowed_mask(
 	}
 
 	/* use backend default access if no backend acls */
-	if( be != NULL && be->be_acl == NULL ) {
+	if ( /* be != NULL && */ be->be_acl == NULL ) {
 		Debug( LDAP_DEBUG_ACL,
 			"=> access_allowed: backend default %s access %s to \"%s\"\n",
 			access2str( access ),
diff --git a/servers/slapd/aclparse.c b/servers/slapd/aclparse.c
index 2466284e1d..0776e0db26 100644
--- a/servers/slapd/aclparse.c
+++ b/servers/slapd/aclparse.c
@@ -63,7 +63,6 @@ static void		acl_regex_normalized_dn(const char *src, struct berval *pat);
 
 #ifdef LDAP_DEBUG
 static void		print_acl(Backend *be, AccessControl *a);
-static void		print_access(Access *b);
 #endif
 
 static int		check_scope( BackendDB *be, AccessControl *a );
@@ -2462,10 +2461,9 @@ access2text( Access *b, char *ptr )
 void
 acl_unparse( AccessControl *a, struct berval *bv )
 {
-	Access *b;
-	char *ptr;
-	int		to = 0;
-	struct berval abv;
+	Access	*b;
+	char	*ptr;
+	int	to = 0;
 
 	bv->bv_val = aclbuf;
 	bv->bv_len = 0;
@@ -2542,8 +2540,6 @@ acl_unparse( AccessControl *a, struct berval *bv )
 static void
 print_acl( Backend *be, AccessControl *a )
 {
-	int		to = 0;
-	Access	*b;
 	struct berval bv;
 
 	acl_unparse( a, &bv );