* it's a hard error and return.
*/
- Debug( LDAP_DEBUG_CONNS, "ber_flush failed errno %d msg (%s)\n",
+ Debug( LDAP_DEBUG_CONNS, "ber_flush failed errno=%d reason=\"%s\"\n",
err, err > -1 && err < sys_nerr ? sys_errlist[err]
: "unknown", 0 );
ber_tag_t tag,
ber_int_t msgid,
ber_int_t err,
- char *matched,
- char *text,
+ const char *matched,
+ const char *text,
struct berval **ref,
- char *resoid,
+ const char *resoid,
struct berval *resdata,
LDAPControl **ctrls
)
Connection *conn,
Operation *op,
ber_int_t err,
- char *text
+ const char *text
)
{
ber_tag_t tag;
Connection *conn,
Operation *op,
ber_int_t err,
- char *matched,
- char *text,
+ const char *matched,
+ const char *text,
struct berval **ref,
LDAPControl **ctrls
)
err = LDAP_NO_SUCH_OBJECT;
} else if ( op->o_protocol < LDAP_VERSION3 ) {
err = LDAP_PARTIAL_RESULTS;
- tmp = text = v2ref( ref );
+ tmp = v2ref( ref );
+ text = tmp;
ref = NULL;
}
}
Connection *conn,
Operation *op,
ber_int_t err,
- char *matched,
- char *text,
+ const char *matched,
+ const char *text,
struct berval **refs,
LDAPControl **ctrls,
int nentries
err = LDAP_PARTIAL_RESULTS;
}
- tmp = text = v2ref( refs );
+ tmp = v2ref( refs );
+ text = tmp;
refs = NULL;
} else {
acl = acl_get_applicable( be, op, e, a->a_type,
MAXREMATCHES, matches );
- if ( ! acl_access_allowed( acl, be, conn, e,
+ if ( ! acl_access_allowed( acl, a->a_type, be, conn, e,
NULL, op, ACL_READ, edn, matches ) )
{
continue;
if ( ! attrsonly ) {
for ( i = 0; a->a_vals[i] != NULL; i++ ) {
if ( a->a_syntax & SYNTAX_DN &&
- ! acl_access_allowed( acl, be, conn, e, a->a_vals[i], op,
+ ! acl_access_allowed( acl, a->a_type, be, conn, e, a->a_vals[i], op,
ACL_READ, edn, matches) )
{
continue;
acl = acl_get_applicable( be, op, e, a->a_type,
MAXREMATCHES, matches );
- if ( ! acl_access_allowed( acl, be, conn, e,
+ if ( ! acl_access_allowed( acl, a->a_type, be, conn, e,
NULL, op, ACL_READ, edn, matches ) )
{
continue;
if ( ! attrsonly ) {
for ( i = 0; a->a_vals[i] != NULL; i++ ) {
if ( a->a_syntax & SYNTAX_DN &&
- ! acl_access_allowed( acl, be, conn, e, a->a_vals[i], op,
+ ! acl_access_allowed( acl, a->a_type, be, conn, e, a->a_vals[i], op,
ACL_READ, edn, matches) )
{
continue;