mirror of
https://git.openldap.org/openldap/openldap.git
synced 2024-12-21 03:10:25 +08:00
LDAP cancel misc patch
This commit is contained in:
parent
57e0ac008c
commit
4f64bd9402
@ -495,7 +495,7 @@ typedef struct ldapcontrol {
|
||||
#define LDAP_CANCEL_NONE 0x00
|
||||
#define LDAP_CANCEL_REQ 0x01
|
||||
#define LDAP_CANCEL_ACK 0x02
|
||||
#define LDAP_CANCEL_NOTDONE 0x03
|
||||
#define LDAP_CANCEL_DONE 0x03
|
||||
|
||||
/*
|
||||
* This structure represents both ldap messages and ldap responses.
|
||||
|
@ -1,3 +1,4 @@
|
||||
/* $OpenLDAP$ */
|
||||
/*
|
||||
* Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
|
||||
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file
|
||||
|
@ -1,3 +1,4 @@
|
||||
/* $OpenLDAP$ */
|
||||
/* cancel.c - LDAP cancel extended operation */
|
||||
/*
|
||||
* Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
|
||||
@ -107,8 +108,9 @@ int cancel_extop(
|
||||
rc = LDAP_SUCCESS;
|
||||
} else {
|
||||
rc = op->o_cancel;
|
||||
op->o_cancel = LDAP_CANCEL_NOTDONE;
|
||||
}
|
||||
|
||||
op->o_cancel = LDAP_CANCEL_DONE;
|
||||
|
||||
return rc;
|
||||
}
|
||||
|
@ -1028,8 +1028,7 @@ operations_error:
|
||||
arg->co_op->o_cancel = LDAP_TOO_LATE;
|
||||
|
||||
while ( arg->co_op->o_cancel != LDAP_CANCEL_NONE &&
|
||||
arg->co_op->o_cancel != LDAP_CANCEL_ACK &&
|
||||
arg->co_op->o_cancel != LDAP_CANCEL_NOTDONE ) {
|
||||
arg->co_op->o_cancel != LDAP_CANCEL_DONE ) {
|
||||
ldap_pvt_thread_yield();
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user