upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-20 22:59:34 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix previous (obviously broken) commit

Browse source
This commit is contained in:
Pierangelo Masarati 2009-02-10 14:19:17 +00:00
parent c93f15514d
commit a7ca1bbc68
5 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tests/progs/slapd-bind.c
View file

@ -343,7 +343,7 @@ do_bind( char *uri, char *dn, struct berval *pass, int maxloop,
rc = ldap_sasl_bind_s( ld, dn, LDAP_SASL_SIMPLE, pass, NULL, NULL, NULL ); rc = ldap_sasl_bind_s( ld, dn, LDAP_SASL_SIMPLE, pass, NULL, NULL, NULL );
if ( rc ) { if ( rc ) {
unsigned first = tester_ignore_err( rc ); int first = tester_ignore_err( rc );
/* if ignore.. */ /* if ignore.. */
if ( first ) { if ( first ) {

11
tests/progs/slapd-common.c
View file

@ -40,8 +40,8 @@ tester_t progtype;
#define TESTER_SERVER_LAST (LDAP_OTHER + 1) #define TESTER_SERVER_LAST (LDAP_OTHER + 1)
#define TESTER_CLIENT_LAST (- LDAP_REFERRAL_LIMIT_EXCEEDED + 1) #define TESTER_CLIENT_LAST (- LDAP_REFERRAL_LIMIT_EXCEEDED + 1)
static unsigned ignore_server[ TESTER_SERVER_LAST ]; static int ignore_server[ TESTER_SERVER_LAST ];
static unsigned ignore_client[ TESTER_CLIENT_LAST ]; static int ignore_client[ TESTER_CLIENT_LAST ];
static struct { static struct {
char *name; char *name;
@ -126,8 +126,7 @@ static struct {
static int static int
tester_ignore_str2err( const char *err ) tester_ignore_str2err( const char *err )
{ {
int i; int i, ignore = 1;
unsigned ignore = 1;
if ( strcmp( err, "ALL" ) == 0 ) { if ( strcmp( err, "ALL" ) == 0 ) {
for ( i = 0; ignore_str2err[ i ].name != NULL; i++ ) { for ( i = 0; ignore_str2err[ i ].name != NULL; i++ ) {
@ -187,10 +186,10 @@ tester_ignore_str2errlist( const char *err )
return 0; return 0;
} }
unsigned int
tester_ignore_err( int err ) tester_ignore_err( int err )
{ {
unsigned rc = 1; int rc = 1;
if ( err > 0 ) { if ( err > 0 ) {
if ( err < TESTER_SERVER_LAST ) { if ( err < TESTER_SERVER_LAST ) {

2
tests/progs/slapd-common.h
View file

@ -37,7 +37,7 @@ extern void tester_error( const char *msg );
extern void tester_perror( const char *fname, const char *msg ); extern void tester_perror( const char *fname, const char *msg );
extern void tester_ldap_error( LDAP *ld, const char *fname, const char *msg ); extern void tester_ldap_error( LDAP *ld, const char *fname, const char *msg );
extern int tester_ignore_str2errlist( const char *err ); extern int tester_ignore_str2errlist( const char *err );
extern unsigned tester_ignore_err( int err ); extern int tester_ignore_err( int err );
extern pid_t pid; extern pid_t pid;

2
tests/progs/slapd-read.c
View file

@ -389,7 +389,7 @@ retry:;
} }
if ( rc ) { if ( rc ) {
unsigned first = tester_ignore_err( rc ); int first = tester_ignore_err( rc );
char buf[ BUFSIZ ]; char buf[ BUFSIZ ];
snprintf( buf, sizeof( buf ), "ldap_search_ext_s(%s)", entry ); snprintf( buf, sizeof( buf ), "ldap_search_ext_s(%s)", entry );

2
tests/progs/slapd-search.c
View file

@ -443,7 +443,7 @@ retry:;
} }
if ( rc ) { if ( rc ) {
unsigned first = tester_ignore_err( rc ); int first = tester_ignore_err( rc );
/* if ignore.. */ /* if ignore.. */
if ( first ) { if ( first ) {
/* only log if first occurrence */ /* only log if first occurrence */