cleanup

diff --git a/servers/slapd/filter.c b/servers/slapd/filter.c
index 5539535578cb3d18f349d1b2553276ae9376174b..f9db732ba227ba19a19a3a64467677746fac2025 100644 (file)
--- a/servers/slapd/filter.c
+++ b/servers/slapd/filter.c
@@ -36,8 +36,6 @@ static int    get_simple_vrFilter(
        ValuesReturnFilter **f,
        const char **text );
 
-#define XXX 1
-
 int
 get_filter(
        Connection *conn,
@@ -243,9 +241,7 @@ get_filter(
                        break;
                }
 
-#ifdef XXX
                assert( f.f_not != NULL );
-#endif
                break;
 
        case LDAP_FILTER_EXT:
@@ -261,9 +257,7 @@ get_filter(
                        break;
                }
 
-#ifdef XXX
                assert( f.f_mra != NULL );
-#endif
                break;
 
        default:

diff --git a/servers/slapd/matchedValues.c b/servers/slapd/matchedValues.c
index febd05d24a37f30760e72c48ccc8c5e7a1962581..e13d66129614fd5e33cdca7d7eac4774d1c779fb 100644 (file)
--- a/servers/slapd/matchedValues.c
+++ b/servers/slapd/matchedValues.c
@@ -17,8 +17,6 @@
 
 #include "slap.h"
 
-#include "../../libraries/liblber/lber-int.h"
-
 static int
 test_mra_vrFilter(
        Operation       *op,