Sync with HEAD

diff --git a/doc/devel/todo b/doc/devel/todo
index d1acb59acb2aa83084a90769edcf6454142ef43a..3454f063052293ba3438d6e4c2cc85d73a5a74a6 100644 (file)
--- 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 e69bb496fa0673f09e6397519a45dfa8625427dd..411bb6eeb45fef5c53be88c7758b8ce8e94fd8eb 100644 (file)
--- 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;