/* $OpenLDAP$ */
/*
- * Copyright 1999-2000 The OpenLDAP Foundation.
+ * Copyright 1999-2002 The OpenLDAP Foundation.
* All rights reserved.
*
* Redistribution and use in source and binary forms are permitted only
#include "../../libraries/liblber/lber-int.h"
-char *supportedControls[] = {
- LDAP_CONTROL_MANAGEDSAIT,
- NULL
+#define SLAP_CTRL_ABANDON 0x0001
+#define SLAP_CTRL_ADD 0x2002
+#define SLAP_CTRL_BIND 0x0004
+#define SLAP_CTRL_COMPARE 0x1008
+#define SLAP_CTRL_DELETE 0x2010
+#define SLAP_CTRL_MODIFY 0x2020
+#define SLAP_CTRL_RENAME 0x2040
+#define SLAP_CTRL_SEARCH 0x1080
+#define SLAP_CTRL_UNBIND 0x0100
+
+#define SLAP_CTRL_INTROGATE (SLAP_CTRL_COMPARE|SLAP_CTRL_SEARCH)
+#define SLAP_CTRL_UPDATE \
+ (SLAP_CTRL_ADD|SLAP_CTRL_DELETE|SLAP_CTRL_MODIFY|SLAP_CTRL_RENAME)
+#define SLAP_CTRL_ACCESS (SLAP_CTRL_INTROGATE|SLAP_CTRL_UPDATE)
+
+typedef int (SLAP_CTRL_PARSE_FN) LDAP_P((
+ Connection *conn,
+ Operation *op,
+ LDAPControl *ctrl,
+ const char **text ));
+
+static SLAP_CTRL_PARSE_FN parseManageDSAit;
+static SLAP_CTRL_PARSE_FN parseSubentries;
+
+static struct slap_control {
+ char *sc_oid;
+ int sc_ops_mask;
+ char **sc_extendedops;
+ SLAP_CTRL_PARSE_FN *sc_parse;
+
+} supportedControls[] = {
+ { LDAP_CONTROL_MANAGEDSAIT,
+ SLAP_CTRL_ACCESS, NULL,
+ parseManageDSAit },
+ { LDAP_CONTROL_SUBENTRIES,
+ SLAP_CTRL_SEARCH, NULL,
+ parseSubentries },
+ { NULL }
};
+char *
+get_supported_ctrl(int index)
+{
+ return supportedControls[index].sc_oid;
+}
+
+static struct slap_control *
+find_ctrl( const char *oid )
+{
+ int i;
+ for( i=0; supportedControls[i].sc_oid; i++ ) {
+ if( strcmp( oid, supportedControls[i].sc_oid ) == 0 ) {
+ return &supportedControls[i];
+ }
+ }
+ return NULL;
+}
+
int get_ctrls(
Connection *conn,
Operation *op,
char *opaque;
BerElement *ber = op->o_ber;
LDAPControl ***ctrls = &op->o_ctrls;
+ struct slap_control *c;
int rc = LDAP_SUCCESS;
- char *errmsg = NULL;
+ const char *errmsg = NULL;
len = ber_pvt_ber_remaining(ber);
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
- "get_ctrls: conn %d\n", conn->c_connid ));
+ "get_ctrls: conn %d\n", conn->c_connid ));
#else
Debug( LDAP_DEBUG_TRACE, "=> get_ctrls\n", 0, 0, 0 );
#endif
if( tag == LBER_ERROR ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
- "get_ctrls: conn %d get OID failed.\n",
- conn->c_connid ));
+ "get_ctrls: conn %d get OID failed.\n",
+ conn->c_connid ));
#else
Debug( LDAP_DEBUG_TRACE, "=> get_ctrls: get oid failed.\n",
0, 0, 0 );
if( tag == LBER_ERROR ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
- "get_ctrls: conn %d get crit failed.\n",
- conn->c_connid ));
+ "get_ctrls: conn %d get crit failed.\n",
+ conn->c_connid ));
#else
Debug( LDAP_DEBUG_TRACE, "=> get_ctrls: get crit failed.\n",
0, 0, 0 );
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
- "get_ctrls: conn %d oid=\"%s\" (%scritical)\n",
- conn->c_connid, tctrl->ldctl_oid,
- tctrl->ldctl_iscritical ? "" : "non" ));
+ "get_ctrls: conn %d oid=\"%s\" (%scritical)\n",
+ conn->c_connid, tctrl->ldctl_oid,
+ tctrl->ldctl_iscritical ? "" : "non" ));
#else
Debug( LDAP_DEBUG_TRACE, "=> get_ctrls: oid=\"%s\" (%scritical)\n",
tctrl->ldctl_oid,
if( tag == LBER_ERROR ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
- "get_ctrls: conn %d get value failed.\n", conn->c_connid ));
+ "get_ctrls: conn %d get value failed.\n", conn->c_connid ));
#else
Debug( LDAP_DEBUG_TRACE, "=> get_ctrls: get value failed.\n",
0, 0, 0 );
}
}
- if( tctrl->ldctl_iscritical &&
- !charray_inlist( supportedControls, tctrl->ldctl_oid ) )
- {
+ c = find_ctrl( tctrl->ldctl_oid );
+ if( c != NULL ) {
+ /* recongized control */
+ int tagmask = -1;
+ switch( op->o_tag ) {
+ case LDAP_REQ_ADD:
+ tagmask = SLAP_CTRL_ADD;
+ break;
+ case LDAP_REQ_BIND:
+ tagmask = SLAP_CTRL_BIND;
+ break;
+ case LDAP_REQ_COMPARE:
+ tagmask = SLAP_CTRL_COMPARE;
+ break;
+ case LDAP_REQ_DELETE:
+ tagmask = SLAP_CTRL_DELETE;
+ break;
+ case LDAP_REQ_MODIFY:
+ tagmask = SLAP_CTRL_MODIFY;
+ break;
+ case LDAP_REQ_RENAME:
+ tagmask = SLAP_CTRL_RENAME;
+ break;
+ case LDAP_REQ_SEARCH:
+ tagmask = SLAP_CTRL_SEARCH;
+ break;
+ case LDAP_REQ_UNBIND:
+ tagmask = SLAP_CTRL_UNBIND;
+ break;
+ case LDAP_REQ_EXTENDED:
+ /* FIXME: check list of extended operations */
+ tagmask = -1;
+ break;
+ default:
+ rc = LDAP_OTHER;
+ errmsg = "controls internal error";
+ goto return_results;
+ }
+
+ if (( c->sc_ops_mask & tagmask ) == tagmask ) {
+ /* available extension */
+
+ if( !c->sc_parse ) {
+ rc = LDAP_OTHER;
+ errmsg = "not yet implemented";
+ goto return_results;
+ }
+
+ rc = c->sc_parse( conn, op, tctrl, &errmsg );
+
+ if( rc != LDAP_SUCCESS ) goto return_results;
+
+ } else if( tctrl->ldctl_iscritical ) {
+ /* unavailable CRITICAL control */
+ rc = LDAP_UNAVAILABLE_CRITICAL_EXTENSION;
+ errmsg = "critical extension is unavailable";
+ goto return_results;
+ }
+
+ } else if( tctrl->ldctl_iscritical ) {
+ /* unrecongized CRITICAL control */
rc = LDAP_UNAVAILABLE_CRITICAL_EXTENSION;
- errmsg = "critical extension is unavailable ";
+ errmsg = "critical extension is not recongized";
goto return_results;
}
return_results:
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_RESULTS,
- "get_ctrls: conn %s %d %d %s\n",
- conn->c_connid, nctrls, rc, errmsg ? errmsg : "" ));
+ "get_ctrls: conn %d %d %d %s\n",
+ conn->c_connid, nctrls, rc, errmsg ? errmsg : "" ));
#else
Debug( LDAP_DEBUG_TRACE, "<= get_ctrls: %d %d %s\n",
nctrls, rc, errmsg ? errmsg : "");
#endif
+
if( sendres && rc != LDAP_SUCCESS ) {
if( rc == SLAPD_DISCONNECT ) {
- send_ldap_disconnect( conn, op, rc, errmsg );
+ send_ldap_disconnect( conn, op, LDAP_PROTOCOL_ERROR, errmsg );
} else {
send_ldap_result( conn, op, rc,
NULL, errmsg, NULL, NULL );
return rc;
}
+static int parseManageDSAit (
+ Connection *conn,
+ Operation *op,
+ LDAPControl *ctrl,
+ const char **text )
+{
+ if ( op->o_managedsait != SLAP_NO_CONTROL ) {
+ *text = "manageDSAit control specified multiple times";
+ return LDAP_PROTOCOL_ERROR;
+ }
+
+ if ( ctrl->ldctl_value.bv_len ) {
+ *text = "manageDSAit control value not empty";
+ return LDAP_PROTOCOL_ERROR;
+ }
+
+ op->o_managedsait = ctrl->ldctl_iscritical
+ ? SLAP_CRITICAL_CONTROL
+ : SLAP_NONCRITICAL_CONTROL;
-int get_manageDSAit( Operation *op )
+ return LDAP_SUCCESS;
+}
+
+static int parseSubentries (
+ Connection *conn,
+ Operation *op,
+ LDAPControl *ctrl,
+ const char **text )
{
- int i;
- if( op == NULL || op->o_ctrls == NULL ) {
- return 0;
+ if ( op->o_subentries != SLAP_NO_CONTROL ) {
+ *text = "subentries control specified multiple times";
+ return LDAP_PROTOCOL_ERROR;
}
- for( i=0; op->o_ctrls[i] != NULL; i++ ) {
- if( strcmp( LDAP_CONTROL_MANAGEDSAIT, op->o_ctrls[i]->ldctl_oid )
- == 0 )
- {
- return 1;
- }
+ /* FIXME: should use BER library */
+ if( ( ctrl->ldctl_value.bv_len != 3 )
+ && ( ctrl->ldctl_value.bv_val[0] != 0x01 )
+ && ( ctrl->ldctl_value.bv_val[1] != 0x01 ))
+ {
+ *text = "subentries control value encoding is bogus";
+ return LDAP_PROTOCOL_ERROR;
}
- return 0;
+ op->o_subentries = ctrl->ldctl_iscritical
+ ? SLAP_CRITICAL_CONTROL
+ : SLAP_NONCRITICAL_CONTROL;
+
+ op->o_subentries_visibility = (ctrl->ldctl_value.bv_val[2] != 0x00);
+
+ return LDAP_SUCCESS;
}
projects / openldap / blobdiff