move ldap_int_put_filter to ldap_pvt_put_filter

and other cleanup

diff --git a/libraries/libldap/filter.c b/libraries/libldap/filter.c
index 891cbd7697530097907fa9cf2ed91db0d9c9571c..fe0fab327b639245fa53e2ee977d9e2b181547d6 100644 (file)
--- a/libraries/libldap/filter.c
+++ b/libraries/libldap/filter.c
@@ -307,7 +307,7 @@ put_complex_filter( BerElement *ber, char *str, ber_tag_t tag, int not )
 }
 
 int
-ldap_int_put_filter( BerElement *ber, const char *str_in )
+ldap_pvt_put_filter( BerElement *ber, const char *str_in )
 {
        int rc;
        char    *freeme;
@@ -349,7 +349,7 @@ ldap_int_put_filter( BerElement *ber, const char *str_in )
         */
 
 #ifdef NEW_LOGGING
-       LDAP_LOG (( "filter", LDAP_LEVEL_ARGS, "ldap_int_put_filter: \"%s\"\n",
+       LDAP_LOG (( "filter", LDAP_LEVEL_ARGS, "ldap_pvt_put_filter: \"%s\"\n",
                str_in ));
 #else
        Debug( LDAP_DEBUG_TRACE, "put_filter: \"%s\"\n", str_in, 0, 0 );
@@ -373,7 +373,7 @@ ldap_int_put_filter( BerElement *ber, const char *str_in )
                        case '&':
 #ifdef NEW_LOGGING
                                LDAP_LOG (( "filter", LDAP_LEVEL_DETAIL1, 
-                                       "ldap_int_put_filter: AND\n" ));
+                                       "ldap_pvt_put_filter: AND\n" ));
 #else
                                Debug( LDAP_DEBUG_TRACE, "put_filter: AND\n",
                                    0, 0, 0 );
@@ -392,7 +392,7 @@ ldap_int_put_filter( BerElement *ber, const char *str_in )
                        case '|':
 #ifdef NEW_LOGGING
                                LDAP_LOG (( "filter", LDAP_LEVEL_DETAIL1, 
-                                       "ldap_int_put_filter: OR\n" ));
+                                       "ldap_pvt_put_filter: OR\n" ));
 #else
                                Debug( LDAP_DEBUG_TRACE, "put_filter: OR\n",
                                    0, 0, 0 );
@@ -411,7 +411,7 @@ ldap_int_put_filter( BerElement *ber, const char *str_in )
                        case '!':
 #ifdef NEW_LOGGING
                                LDAP_LOG (( "filter", LDAP_LEVEL_DETAIL1, 
-                                       "ldap_int_put_filter: NOT\n" ));
+                                       "ldap_pvt_put_filter: NOT\n" ));
 #else
                                Debug( LDAP_DEBUG_TRACE, "put_filter: NOT\n",
                                    0, 0, 0 );
@@ -430,7 +430,7 @@ ldap_int_put_filter( BerElement *ber, const char *str_in )
                        default:
 #ifdef NEW_LOGGING
                                LDAP_LOG (( "filter", LDAP_LEVEL_DETAIL1, 
-                                       "ldap_int_put_filter: simple\n" ));
+                                       "ldap_pvt_put_filter: simple\n" ));
 #else
                                Debug( LDAP_DEBUG_TRACE, "put_filter: simple\n",
                                    0, 0, 0 );
@@ -481,7 +481,7 @@ ldap_int_put_filter( BerElement *ber, const char *str_in )
                case /*'('*/ ')':
 #ifdef NEW_LOGGING
                        LDAP_LOG (( "filter", LDAP_LEVEL_DETAIL1, 
-                               "ldap_int_put_filter: end\n" ));
+                               "ldap_pvt_put_filter: end\n" ));
 #else
                        Debug( LDAP_DEBUG_TRACE, "put_filter: end\n",
                                0, 0, 0 );
@@ -501,7 +501,7 @@ ldap_int_put_filter( BerElement *ber, const char *str_in )
                default:        /* assume it's a simple type=value filter */
 #ifdef NEW_LOGGING
                        LDAP_LOG (( "filter", LDAP_LEVEL_DETAIL1, 
-                               "ldap_int_put_filter: default\n" ));
+                               "ldap_pvt_put_filter: default\n" ));
 #else
                        Debug( LDAP_DEBUG_TRACE, "put_filter: default\n",
                                0, 0, 0 );
@@ -554,7 +554,7 @@ put_filter_list( BerElement *ber, char *str, ber_tag_t tag )
 
                /* now we have "(filter)" with str pointing to it */
                *next = '\0';
-               if ( ldap_int_put_filter( ber, str ) == -1 ) return -1;
+               if ( ldap_pvt_put_filter( ber, str ) == -1 ) return -1;
                *next = save;
                str = next;
 

diff --git a/libraries/libldap/ftest.c b/libraries/libldap/ftest.c
index 8fda498e38d62bf8bc0359520e44b45b6a47a815..587c0638bfe6d6993105ab18dadad39aafc1722a 100644 (file)
--- a/libraries/libldap/ftest.c
+++ b/libraries/libldap/ftest.c
@@ -15,7 +15,7 @@
 
 #include <ldap.h>
 
-#include "ldap-int.h"
+#include "ldap_pvt.h"
 
 #include "ldif.h"
 #include "lutil.h"
@@ -88,7 +88,7 @@ static int filter2ber( char *filter )
                return EXIT_FAILURE;
        }
 
-       rc = ldap_int_put_filter( ber, filter );
+       rc = ldap_pvt_put_filter( ber, filter );
        if( rc < 0 ) {
                fprintf( stderr, "Filter error!\n");
                return EXIT_FAILURE;

diff --git a/libraries/libldap/ldap-int.h b/libraries/libldap/ldap-int.h
index 2b9df3da604843911f2099f515a15de50f210b9b..baeebd69260764efd08b346c9f462020367d494c 100644 (file)
--- a/libraries/libldap/ldap-int.h
+++ b/libraries/libldap/ldap-int.h
@@ -488,9 +488,6 @@ LDAP_F (BerElement *) ldap_build_search_req LDAP_P((
        ber_int_t timelimit,
        ber_int_t sizelimit ));
 
-LDAP_F( int ) ldap_int_put_filter LDAP_P((
-       BerElement *ber,
-       const char *str ));
 
 /*
  * in unbind.c

diff --git a/libraries/libldap/search.c b/libraries/libldap/search.c
index c8e276a6635af17e1f90e61675c094c103fb9e06..75eae1cb92caf9c960019706b5172099f0fd86bd 100644 (file)
--- a/libraries/libldap/search.c
+++ b/libraries/libldap/search.c
@@ -295,7 +295,7 @@ ldap_build_search_req(
                filter = "(objectclass=*)";
        }
 
-       err = ldap_int_put_filter( ber, filter );
+       err = ldap_pvt_put_filter( ber, filter );
 
        if ( err  == -1 ) {
                ld->ld_errno = LDAP_FILTER_ERROR;

diff --git a/servers/slapd/back-bdb/backbdb.dsp b/servers/slapd/back-bdb/backbdb.dsp
index c2e5afabe68ae15630902cf412aa6afe98c372b4..9c465633690d56e66c5285b9c363e61dd5bfb71b 100644 (file)
--- a/servers/slapd/back-bdb/backbdb.dsp
+++ b/servers/slapd/back-bdb/backbdb.dsp
@@ -231,6 +231,10 @@ SOURCE=.\nextid.c
 # End Source File
 # Begin Source File
 
+SOURCE=.\operational.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\passwd.c
 # End Source File
 # Begin Source File

diff --git a/servers/slapd/filter.c b/servers/slapd/filter.c
index 1242a6091f6fbe13094e2d85c048ac267164a1e9..16124c0c31bc588670946ab4a706ca3aef10a650 100644 (file)
--- a/servers/slapd/filter.c
+++ b/servers/slapd/filter.c
@@ -330,7 +330,6 @@ get_substring_filter(
        ber_len_t       len;
        ber_tag_t       rc;
        struct berval value;
-       struct berval escaped;
        char            *last;
        struct berval bv;
        *text = "error decoding filter";

diff --git a/servers/slapd/str2filter.c b/servers/slapd/str2filter.c
index 3392aefbc498d6c7c543280a8243ff2d40802c63..45a42ad60034e5c883520f39f5a859ed9bc6d6bb 100644 (file)
--- a/servers/slapd/str2filter.c
+++ b/servers/slapd/str2filter.c
@@ -48,7 +48,7 @@ str2filter( const char *str )
                return NULL;
        }
 
-       rc = ldap_int_put_filter( ber, str );
+       rc = ldap_pvt_put_filter( ber, str );
        if( rc < 0 ) {
                goto done;
        }