parseSubentries, LDAP_SLIST_ENTRY_INITIALIZER(next) },
#endif
{ LDAP_CONTROL_NOOP,
- SLAP_CTRL_ACCESS, NULL,
+ SLAP_CTRL_HIDE|SLAP_CTRL_ACCESS, NULL,
parseNoOp, LDAP_SLIST_ENTRY_INITIALIZER(next) },
{ LDAP_CONTROL_SYNC,
SLAP_CTRL_HIDE|SLAP_CTRL_SEARCH, NULL,
LDAPControl *ctrl )
{
int rc;
- struct berval dn = { 0, NULL };
+ struct berval dn = BER_BVNULL;
if ( op->o_proxy_authz != SLAP_NO_CONTROL ) {
rs->sr_text = "proxy authorization control specified multiple times";
return LDAP_SUCCESS;
}
- rc = slap_sasl_getdn( op->o_conn, op,
- ctrl->ldctl_value.bv_val, ctrl->ldctl_value.bv_len,
+ rc = slap_sasl_getdn( op->o_conn, op, &ctrl->ldctl_value,
NULL, &dn, SLAP_GETDN_AUTHZID );
if( rc != LDAP_SUCCESS || !dn.bv_len ) {
ber_tag_t tag;
ber_int_t size;
BerElement *ber;
- struct berval cookie = { 0, NULL };
+ struct berval cookie = BER_BVNULL;
if ( op->o_pagedresults != SLAP_NO_CONTROL ) {
rs->sr_text = "paged results control specified multiple times";
AC_MEMCPY( &reqcookie, cookie.bv_val, sizeof( reqcookie ));
- if( reqcookie > op->o_pagedresults_state.ps_cookie ) {
+ if ( reqcookie > op->o_pagedresults_state.ps_cookie ) {
/* bad cookie */
rs->sr_text = "paged results cookie is invalid";
return LDAP_PROTOCOL_ERROR;
- } else if( reqcookie < op->o_pagedresults_state.ps_cookie ) {
+ } else if ( reqcookie < op->o_pagedresults_state.ps_cookie ) {
rs->sr_text = "paged results cookie is invalid or old";
return LDAP_UNWILLING_TO_PERFORM;
}
+
} else {
/* Initial request. Initialize state. */
op->o_pagedresults_state.ps_cookie = 0;
- op->o_pagedresults_state.ps_id = NOID;
+ op->o_pagedresults_state.ps_count = 0;
}
op->o_pagedresults_size = size;
LDAPControl *ctrl )
{
BerElement *ber;
- struct berval fstr = { 0, NULL };
+ struct berval fstr = BER_BVNULL;
const char *err_msg = "";
if ( op->o_assert != SLAP_NO_CONTROL ) {
LDAPControl *ctrl )
{
BerElement *ber;
- struct berval fstr = { 0, NULL };
+ struct berval fstr = BER_BVNULL;
const char *err_msg = "";
if ( op->o_valuesreturnfilter != SLAP_NO_CONTROL ) {
(void) ber_free( ber, 1 );
- if ( search_flags & LDAP_SERVER_SEARCH_FLAG_DOMAIN_SCOPE ) {
+ if ( search_flags & LDAP_SEARCH_FLAG_DOMAIN_SCOPE ) {
if ( op->o_domain_scope != SLAP_NO_CONTROL ) {
rs->sr_text = "searchOptions control specified multiple times or with domainScope control";
return LDAP_PROTOCOL_ERROR;
: SLAP_NONCRITICAL_CONTROL;
}
- if ( search_flags & ~(LDAP_SERVER_SEARCH_FLAG_DOMAIN_SCOPE) ) {
+ if ( search_flags & ~(LDAP_SEARCH_FLAG_DOMAIN_SCOPE) ) {
/* Other search flags not recognised so far */
rs->sr_text = "searchOptions contained invalid flag";
return LDAP_UNAVAILABLE_CRITICAL_EXTENSION;