Commit 75a983f5 authored by Howard Chu's avatar Howard Chu
Browse files

Partial sync with HEAD, fix ITS#4736, #4709

parent 3ac8f782
This diff is collapsed.
This diff is collapsed.
......@@ -166,3 +166,32 @@ slap_op_alloc(
return( op );
}
slap_op_t
slap_req2op( ber_tag_t tag )
{
switch ( tag ) {
case LDAP_REQ_BIND:
return SLAP_OP_BIND;
case LDAP_REQ_UNBIND:
return SLAP_OP_UNBIND;
case LDAP_REQ_ADD:
return SLAP_OP_ADD;
case LDAP_REQ_DELETE:
return SLAP_OP_DELETE;
case LDAP_REQ_MODRDN:
return SLAP_OP_MODRDN;
case LDAP_REQ_MODIFY:
return SLAP_OP_MODIFY;
case LDAP_REQ_COMPARE:
return SLAP_OP_COMPARE;
case LDAP_REQ_SEARCH:
return SLAP_OP_SEARCH;
case LDAP_REQ_ABANDON:
return SLAP_OP_ABANDON;
case LDAP_REQ_EXTENDED:
return SLAP_OP_EXTENDED;
}
return SLAP_OP_LAST;
}
......@@ -720,8 +720,8 @@ LDAP_SLAPD_F (int) slapd_daemon_init( const char *urls );
LDAP_SLAPD_F (int) slapd_daemon_destroy(void);
LDAP_SLAPD_F (int) slapd_daemon(void);
LDAP_SLAPD_F (Listener **) slapd_get_listeners LDAP_P((void));
LDAP_SLAPD_F (void) slapd_remove LDAP_P((ber_socket_t s, int wasactive,
int wake, int locked ));
LDAP_SLAPD_F (void) slapd_remove LDAP_P((ber_socket_t s, Sockbuf *sb,
int wasactive, int wake, int locked ));
LDAP_SLAPD_F (void) slapd_sd_lock();
LDAP_SLAPD_F (void) slapd_sd_unlock();
......@@ -1241,6 +1241,7 @@ LDAP_SLAPD_F (Operation *) slap_op_alloc LDAP_P((
LDAP_SLAPD_F (int) slap_op_add LDAP_P(( Operation **olist, Operation *op ));
LDAP_SLAPD_F (int) slap_op_remove LDAP_P(( Operation **olist, Operation *op ));
LDAP_SLAPD_F (Operation *) slap_op_pop LDAP_P(( Operation **olist ));
LDAP_SLAPD_F (slap_op_t) slap_req2op LDAP_P(( ber_tag_t tag ));
/*
* operational.c
......
......@@ -2718,7 +2718,7 @@ struct slap_listener {
/*
* Operation indices
*/
enum {
typedef enum {
SLAP_OP_BIND = 0,
SLAP_OP_UNBIND,
SLAP_OP_ADD,
......@@ -2730,7 +2730,7 @@ enum {
SLAP_OP_ABANDON,
SLAP_OP_EXTENDED,
SLAP_OP_LAST
};
} slap_op_t;
typedef struct slap_counters_t {
ldap_pvt_thread_mutex_t sc_sent_mutex;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment