servers/slapd/filter.c - diff

Return to filter.c CVS log

Up to [OpenLDAP] / servers / slapd

Diff for /servers/slapd/filter.c between versions 1.1.4.1 and 1.2

version 1.1.4.1, 1998/08/08 23:05:19	version 1.2, 1998/08/09 02:13:59
Line 135 get_filter( Connection *conn, BerElement	Line 135 get_filter( Connection *conn, BerElement
Debug( LDAP_DEBUG_FILTER, "AND\n", 0, 0, 0 );	Debug( LDAP_DEBUG_FILTER, "AND\n", 0, 0, 0 );
if ( (err = get_filter_list( conn, ber, &f->f_and, &ftmp ))	if ( (err = get_filter_list( conn, ber, &f->f_and, &ftmp ))
== 0 ) {	== 0 ) {
	if (ftmp == NULL) ftmp = strdup("");
*fstr = ch_malloc( 4 + strlen( ftmp ) );	*fstr = ch_malloc( 4 + strlen( ftmp ) );
sprintf( *fstr, "(&%s)", ftmp );	sprintf( *fstr, "(&%s)", ftmp );
free( ftmp );	free( ftmp );
Line 145 get_filter( Connection *conn, BerElement	Line 146 get_filter( Connection *conn, BerElement
Debug( LDAP_DEBUG_FILTER, "OR\n", 0, 0, 0 );	Debug( LDAP_DEBUG_FILTER, "OR\n", 0, 0, 0 );
if ( (err = get_filter_list( conn, ber, &f->f_or, &ftmp ))	if ( (err = get_filter_list( conn, ber, &f->f_or, &ftmp ))
== 0 ) {	== 0 ) {
	if (ftmp == NULL) ftmp = strdup("");
*fstr = ch_malloc( 4 + strlen( ftmp ) );	*fstr = ch_malloc( 4 + strlen( ftmp ) );
sprintf( *fstr, "(\|%s)", ftmp );	sprintf( *fstr, "(\|%s)", ftmp );
free( ftmp );	free( ftmp );
Line 155 get_filter( Connection *conn, BerElement	Line 157 get_filter( Connection *conn, BerElement
Debug( LDAP_DEBUG_FILTER, "NOT\n", 0, 0, 0 );	Debug( LDAP_DEBUG_FILTER, "NOT\n", 0, 0, 0 );
(void) ber_skip_tag( ber, &len );	(void) ber_skip_tag( ber, &len );
if ( (err = get_filter( conn, ber, &f->f_not, &ftmp )) == 0 ) {	if ( (err = get_filter( conn, ber, &f->f_not, &ftmp )) == 0 ) {
	if (ftmp == NULL) ftmp = strdup("");
*fstr = ch_malloc( 4 + strlen( ftmp ) );	*fstr = ch_malloc( 4 + strlen( ftmp ) );
sprintf( *fstr, "(!%s)", ftmp );	sprintf( *fstr, "(!%s)", ftmp );
free( ftmp );	free( ftmp );

Removed from v.1.1.4.1
changed lines
	Added in v.1.2