mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-01-06 10:46:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

minor improvements

Browse Source
This commit is contained in:
Pierangelo Masarati 2004-04-26 00:17:58 +00:00
parent ff0df4b6aa
commit 2919bc09ac
3 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
servers/slapd/slapacl.c
View File

@ -112,7 +112,10 @@ slapacl( int argc, char **argv )
if ( access == ACL_INVALID_ACCESS ) { if ( access == ACL_INVALID_ACCESS ) {
fprintf( stderr, "unknown access \"%s\" for attribute \"%s\"\n", fprintf( stderr, "unknown access \"%s\" for attribute \"%s\"\n",
accessstr, argv[0] ); accessstr, argv[0] );
continue; if ( continuemode ) {
continue;
}
break;
} }
} }
@ -120,10 +123,13 @@ slapacl( int argc, char **argv )
if ( rc != LDAP_SUCCESS ) { if ( rc != LDAP_SUCCESS ) {
fprintf( stderr, "slap_str2ad(%s) failed %d (%s)\n", fprintf( stderr, "slap_str2ad(%s) failed %d (%s)\n",
argv[0], rc, ldap_err2string( rc ) ); argv[0], rc, ldap_err2string( rc ) );
continue; if ( continuemode ) {
continue;
}
break;
} }
rc = access_allowed_mask( &op, &e, desc, &val, access, (void)access_allowed_mask( &op, &e, desc, &val, access,
NULL, &mask ); NULL, &mask );
fprintf( stderr, "%s%s%s: %s\n", fprintf( stderr, "%s%s%s: %s\n",

10
servers/slapd/slapauth.c
View File

@ -130,9 +130,11 @@ slapauth( int argc, char **argv )
fprintf( stderr, "authzID: <%s> check failed %d (%s)\n", fprintf( stderr, "authzID: <%s> check failed %d (%s)\n",
authzID.bv_val, rc, authzID.bv_val, rc,
ldap_err2string( rc ) ); ldap_err2string( rc ) );
rc = 1; rc = -1;
BER_BVZERO( &authzID ); BER_BVZERO( &authzID );
goto destroy; if ( !continuemode ) {
goto destroy;
}
} }
authzID = authzdn; authzID = authzdn;
@ -142,7 +144,7 @@ slapauth( int argc, char **argv )
op.o_tmpfree( authzID.bv_val, op.o_tmpmemctx ); op.o_tmpfree( authzID.bv_val, op.o_tmpmemctx );
BER_BVZERO( &authzID ); BER_BVZERO( &authzID );
if ( rc ) { if ( rc && !continuemode ) {
goto destroy; goto destroy;
} }
} }
@ -157,7 +159,7 @@ slapauth( int argc, char **argv )
rc = do_check( &conn, &op, &id ); rc = do_check( &conn, &op, &id );
if ( rc ) { if ( rc && !continuemode ) {
goto destroy; goto destroy;
} }
} }

8
servers/slapd/slapdn.c
View File

@ -37,7 +37,7 @@
int int
slapdn( int argc, char **argv ) slapdn( int argc, char **argv )
{ {
int rc = EXIT_SUCCESS; int rc = 0;
const char *progname = "slapdn"; const char *progname = "slapdn";
#ifdef NEW_LOGGING #ifdef NEW_LOGGING
@ -59,7 +59,10 @@ slapdn( int argc, char **argv )
fprintf( stderr, "DN: <%s> check failed %d (%s)\n", fprintf( stderr, "DN: <%s> check failed %d (%s)\n",
dn.bv_val, rc, dn.bv_val, rc,
ldap_err2string( rc ) ); ldap_err2string( rc ) );
rc = 1; if ( !continuemode ) {
rc = -1;
break;
}
} else { } else {
fprintf( stderr, "DN: <%s> check succeeded\n" fprintf( stderr, "DN: <%s> check succeeded\n"
@ -69,7 +72,6 @@ slapdn( int argc, char **argv )
ndn.bv_val, pdn.bv_val ); ndn.bv_val, pdn.bv_val );
ch_free( ndn.bv_val ); ch_free( ndn.bv_val );
ch_free( pdn.bv_val ); ch_free( pdn.bv_val );
rc = 0;
} }
} }