From: Kurt Zeilenga <kurt@openldap.org>
Date: Thu, 28 Nov 2002 23:13:25 +0000 (+0000)
Subject: Sync with HEAD
X-Git-Tag: OPENLDAP_REL_ENG_2_1_9~13
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=7a9e1d561c71699f2c704fa19b906fcbaa80cf38;p=openldap

Sync with HEAD
---

diff --git a/doc/devel/todo b/doc/devel/todo
index d1acb59acb..3454f06305 100644
--- a/doc/devel/todo
+++ b/doc/devel/todo
@@ -30,8 +30,9 @@ OpenLDAP 2.x Projects
 
 Large projects
 --------------
-Redesign slapd memory allocation fault handling
 Localize slapd
+Implement X.500 administrative models (e.g. subentries, etc.)
+Implement LDAP component matching
 
 
 Medium projects
@@ -41,6 +42,7 @@ Implement DIT Structure Rules and Name Forms
 Implement LDAP Cancel extension
 Implement LDAP Transactions extension
 Implement Proxy Authorization Control extension
+Redesign slapd memory allocation fault handling
 Localize tools
 
 
diff --git a/libraries/liblber/decode.c b/libraries/liblber/decode.c
index e69bb496fa..411bb6eeb4 100644
--- a/libraries/liblber/decode.c
+++ b/libraries/liblber/decode.c
@@ -619,13 +619,6 @@ ber_scanf ( BerElement *ber,
 	va_list		ap;
 	LDAP_CONST char		*fmt_reset;
 	char		*s, **ss;
-#ifdef TMP_SLOTS
-	char		*last;
-	char ***sss;
-	ber_tag_t tag;
-	struct berval ***bv;
-	int j;
-#endif
 	struct berval	**bvp, *bval;
 	ber_int_t	*i;
 	ber_len_t	*l;