Use stderr instead of stdout

diff --git a/CHANGES b/CHANGES
index b29326c51690571e6b4aa6d321a4437c37478fb2..22cf0f0b3465de3449509a807387e549743055ca 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,8 @@ OpenLDAP Change Log
 
 Changes included in OpenLDAP Stable 
        CVS Tag: OPENLDAP_STABLE 
+       Fixed slapd filter.c to error on stderr
+       Fixed slapd/back-ldbm/group.c member bug
 
 Changes included in OpenLDAP Stable 
        CVS Tag: OPENLDAP_STABLE_981025 

diff --git a/servers/slapd/filter.c b/servers/slapd/filter.c
index 8d990b361d4b42ce5f137437199b1acb78858d97..87701bbc1fb6708fb5da8a6d2baa34ab7c865ae8 100644 (file)
--- a/servers/slapd/filter.c
+++ b/servers/slapd/filter.c
@@ -135,6 +135,7 @@ get_filter( Connection *conn, BerElement *ber, Filter **filt, char **fstr )
                Debug( LDAP_DEBUG_FILTER, "AND\n", 0, 0, 0 );
                if ( (err = get_filter_list( conn, ber, &f->f_and, &ftmp ))
                    == 0 ) {
+                       if (ftmp == NULL) ftmp = strdup("");
                        *fstr = ch_malloc( 4 + strlen( ftmp ) );
                        sprintf( *fstr, "(&%s)", ftmp );
                        free( ftmp );
@@ -145,6 +146,7 @@ get_filter( Connection *conn, BerElement *ber, Filter **filt, char **fstr )
                Debug( LDAP_DEBUG_FILTER, "OR\n", 0, 0, 0 );
                if ( (err = get_filter_list( conn, ber, &f->f_or, &ftmp ))
                    == 0 ) {
+                       if (ftmp == NULL) ftmp = strdup("");
                        *fstr = ch_malloc( 4 + strlen( ftmp ) );
                        sprintf( *fstr, "(|%s)", ftmp );
                        free( ftmp );
@@ -155,6 +157,7 @@ get_filter( Connection *conn, BerElement *ber, Filter **filt, char **fstr )
                Debug( LDAP_DEBUG_FILTER, "NOT\n", 0, 0, 0 );
                (void) ber_skip_tag( ber, &len );
                if ( (err = get_filter( conn, ber, &f->f_not, &ftmp )) == 0 ) {
+                       if (ftmp == NULL) ftmp = strdup("");
                        *fstr = ch_malloc( 4 + strlen( ftmp ) );
                        sprintf( *fstr, "(!%s)", ftmp );
                        free( ftmp );
@@ -385,63 +388,63 @@ filter_print( Filter *f )
        Filter  *p;
 
        if ( f == NULL ) {
-               printf( "NULL" );
+               fprintf( stderr, "NULL" );
        }
 
        switch ( f->f_choice ) {
        case LDAP_FILTER_EQUALITY:
-               printf( "(%s=%s)", f->f_ava.ava_type,
+               fprintf( stderr, "(%s=%s)", f->f_ava.ava_type,
                    f->f_ava.ava_value.bv_val );
                break;
 
        case LDAP_FILTER_GE:
-               printf( "(%s>=%s)", f->f_ava.ava_type,
+               fprintf( stderr, "(%s>=%s)", f->f_ava.ava_type,
                    f->f_ava.ava_value.bv_val );
                break;
 
        case LDAP_FILTER_LE:
-               printf( "(%s<=%s)", f->f_ava.ava_type,
+               fprintf( stderr, "(%s<=%s)", f->f_ava.ava_type,
                    f->f_ava.ava_value.bv_val );
                break;
 
        case LDAP_FILTER_APPROX:
-               printf( "(%s~=%s)", f->f_ava.ava_type,
+               fprintf( stderr, "(%s~=%s)", f->f_ava.ava_type,
                    f->f_ava.ava_value.bv_val );
                break;
 
        case LDAP_FILTER_SUBSTRINGS:
-               printf( "(%s=", f->f_sub_type );
+               fprintf( stderr, "(%s=", f->f_sub_type );
                if ( f->f_sub_initial != NULL ) {
-                       printf( "%s", f->f_sub_initial );
+                       fprintf( stderr, "%s", f->f_sub_initial );
                }
                if ( f->f_sub_any != NULL ) {
                        for ( i = 0; f->f_sub_any[i] != NULL; i++ ) {
-                               printf( "*%s", f->f_sub_any[i] );
+                               fprintf( stderr, "*%s", f->f_sub_any[i] );
                        }
                }
                charray_free( f->f_sub_any );
                if ( f->f_sub_final != NULL ) {
-                       printf( "*%s", f->f_sub_final );
+                       fprintf( stderr, "*%s", f->f_sub_final );
                }
                break;
 
        case LDAP_FILTER_PRESENT:
-               printf( "%s=*", f->f_type );
+               fprintf( stderr, "%s=*", f->f_type );
                break;
 
        case LDAP_FILTER_AND:
        case LDAP_FILTER_OR:
        case LDAP_FILTER_NOT:
-               printf( "(%c", f->f_choice == LDAP_FILTER_AND ? '&' :
+               fprintf( stderr, "(%c", f->f_choice == LDAP_FILTER_AND ? '&' :
                    f->f_choice == LDAP_FILTER_OR ? '|' : '!' );
                for ( p = f->f_list; p != NULL; p = p->f_next ) {
                        filter_print( p );
                }
-               printf( ")" );
+               fprintf( stderr, ")" );
                break;
 
        default:
-               printf( "unknown type %d", f->f_choice );
+               fprintf( stderr, "unknown type %d", f->f_choice );
                break;
        }
 }