/* result.c - routines to send ldap results, errors, and referrals */
+/* $OpenLDAP$ */
#include "portable.h"
#include <ac/errno.h>
#include <ac/signal.h>
#include <ac/string.h>
+#include <ac/ctype.h>
#include <ac/time.h>
#include <ac/unistd.h>
-#include "ldap_defaults.h"
#include "slap.h"
/* we need LBER internals */
#include "../../libraries/liblber/lber-int.h"
-static char *v2ref( struct berval **ref )
+static char *v2ref( struct berval **ref, const char *text )
{
- size_t len, i;
+ size_t len = 0, i = 0;
char *v2;
- if(ref == NULL) return NULL;
-
- len = sizeof("Referral:");
- v2 = ch_strdup("Referral:");
+ if(ref == NULL)
+ {
+ if (text)
+ return ch_strdup(text);
+ else
+ return NULL;
+ }
+
+ if (text) {
+ len = strlen( text );
+ if (text[len-1] != '\n')
+ i = 1;
+ }
+ v2 = ch_malloc( len+i+sizeof("Referral:") );
+ if (text) {
+ strcpy(v2, text);
+ if (i)
+ v2[len++] = '\n';
+ }
+ strcpy( v2+len, "Referral:" );
+ len += sizeof("Referral:");
for( i=0; ref[i] != NULL; i++ ) {
v2 = ch_realloc( v2, len + ref[i]->bv_len + 1 );
v2[len-1] = '\n';
memcpy(&v2[len], ref[i]->bv_val, ref[i]->bv_len );
len += ref[i]->bv_len;
+ if (ref[i]->bv_val[ref[i]->bv_len-1] != '/')
+ ++len;
}
v2[len-1] = '\0';
if( refs == NULL ) return;
for( i=0; refs[i] != NULL; i++ ) {
- if( refs[i]->bv_len > sizeof("ldap://") &&
+ if( refs[i]->bv_len > sizeof("ldap://")-1 &&
strncasecmp( refs[i]->bv_val, "ldap://",
sizeof("ldap://")-1 ) == 0 )
{
unsigned j;
- for( j=sizeof("ldap://"); j<refs[i]->bv_len ; j++ ) {
- if( refs[i]->bv_val[j] = '/' ) {
+ for( j=sizeof("ldap://")-1; j<refs[i]->bv_len ; j++ ) {
+ if( refs[i]->bv_val[j] == '/' ) {
refs[i]->bv_val[j] = '\0';
refs[i]->bv_len = j;
break;
Connection *conn,
BerElement *ber )
{
- ber_len_t bytes = ber_pvt_ber_bytes( ber );
+ ber_len_t bytes;
+
+ ber_get_option( ber, LBER_OPT_BER_BYTES_TO_WRITE, &bytes );
/* write only one pdu at a time - wait til it's our turn */
ldap_pvt_thread_mutex_lock( &conn->c_write_mutex );
if ( connection_state_closing( conn ) ) {
ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
ldap_pvt_thread_mutex_unlock( &conn->c_write_mutex );
+
return 0;
}
- if ( ber_flush( conn->c_sb, ber, 1 ) == 0 ) {
+ if ( ber_flush( conn->c_sb, ber, 0 ) == 0 ) {
break;
}
* it's a hard error and return.
*/
- Debug( LDAP_DEBUG_CONNS, "ber_flush failed errno %d msg (%s)\n",
- err, err > -1 && err < sys_nerr ? sys_errlist[err]
- : "unknown", 0 );
+ Debug( LDAP_DEBUG_CONNS, "ber_flush failed errno=%d reason=\"%s\"\n",
+ err, STRERROR(err), 0 );
if ( err != EWOULDBLOCK && err != EAGAIN ) {
connection_closing( conn );
ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
ldap_pvt_thread_mutex_unlock( &conn->c_write_mutex );
+
return( -1 );
}
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,
+ struct berval *sasldata,
LDAPControl **ctrls
)
{
rc = ber_printf( ber, "{V}", ref );
}
+ if( rc != -1 && sasldata != NULL ) {
+ rc = ber_printf( ber, "tO",
+ LDAP_TAG_SASL_RES_CREDS, sasldata );
+ }
+
if( rc != -1 && resoid != NULL ) {
- rc = ber_printf( ber, "s", resoid );
+ rc = ber_printf( ber, "ts",
+ LDAP_TAG_EXOP_RES_OID, resoid );
}
if( rc != -1 && resdata != NULL ) {
- rc = ber_printf( ber, "O", resdata );
-
+ rc = ber_printf( ber, "tO",
+ LDAP_TAG_EXOP_RES_VALUE, resdata );
}
if( rc != -1 ) {
if ( rc == -1 ) {
Debug( LDAP_DEBUG_ANY, "ber_printf failed\n", 0, 0, 0 );
+ ber_free( ber, 1 );
return;
}
/* send BER */
bytes = send_ldap_ber( conn, ber );
+ ber_free( ber, 1 );
if ( bytes < 0 ) {
Debug( LDAP_DEBUG_ANY,
Connection *conn,
Operation *op,
ber_int_t err,
- char *text
+ const char *text
)
{
ber_tag_t tag;
0 );
}
#endif
+
send_ldap_response( conn, op, tag, msgid,
err, NULL, text, NULL,
- reqoid, NULL, NULL );
+ reqoid, NULL, NULL, NULL );
Statslog( LDAP_DEBUG_STATS,
"conn=%ld op=%ld DISCONNECT err=%ld tag=%lu text=%s\n",
(long) op->o_connid, (long) op->o_opid,
- (long) tag, (long) err, text );
+ (long) tag, (long) err, text ? text : "" );
}
void
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 );
- ref = NULL;
}
}
+ if ( op->o_protocol < LDAP_VERSION3 ) {
+ tmp = v2ref( ref, text );
+ text = tmp;
+ ref = NULL;
+ }
+
tag = req2res( op->o_tag );
msgid = (tag != LBER_SEQUENCE) ? op->o_msgid : 0;
send_ldap_response( conn, op, tag, msgid,
err, matched, text, ref,
- NULL, NULL, ctrls );
+ NULL, NULL, NULL, ctrls );
Statslog( LDAP_DEBUG_STATS,
"conn=%ld op=%ld RESULT tag=%lu err=%ld text=%s\n",
(long) op->o_connid, (long) op->o_opid,
- (long) tag, (long) err, text );
+ (long) tag, (long) err, text ? text : "" );
if( tmp != NULL ) {
- free(tmp);
+ ch_free(tmp);
}
}
+void
+send_ldap_sasl(
+ Connection *conn,
+ Operation *op,
+ ber_int_t err,
+ const char *matched,
+ const char *text,
+ struct berval **ref,
+ LDAPControl **ctrls,
+ struct berval *cred
+)
+{
+ ber_tag_t tag;
+ ber_int_t msgid;
+
+ Debug( LDAP_DEBUG_TRACE, "send_ldap_sasl %ld\n",
+ (long) err, NULL, NULL );
+
+ tag = req2res( op->o_tag );
+ msgid = (tag != LBER_SEQUENCE) ? op->o_msgid : 0;
+
+#ifdef LDAP_CONNECTIONLESS
+ if ( op->o_cldap ) {
+ ber_pvt_sb_udp_set_dst( conn->c_sb, &op->o_clientaddr );
+ Debug( LDAP_DEBUG_TRACE, "UDP response to %s port %d\n",
+ inet_ntoa(((struct sockaddr_in *)
+ &op->o_clientaddr)->sin_addr ),
+ ((struct sockaddr_in *) &op->o_clientaddr)->sin_port,
+ 0 );
+ }
+#endif
+
+ send_ldap_response( conn, op, tag, msgid,
+ err, matched, text, ref,
+ NULL, NULL, cred, ctrls );
+}
+
+void
+send_ldap_extended(
+ Connection *conn,
+ Operation *op,
+ ber_int_t err,
+ const char *matched,
+ const char *text,
+ struct berval **refs,
+ char *rspoid,
+ struct berval *rspdata,
+ LDAPControl **ctrls
+)
+{
+ ber_tag_t tag;
+ ber_int_t msgid;
+
+ Debug( LDAP_DEBUG_TRACE,
+ "send_ldap_extended %ld:%s (%ld)\n",
+ (long) err,
+ rspoid ? rspoid : "",
+ rspdata != NULL ? (long) rspdata->bv_len : (long) 0 );
+
+ tag = req2res( op->o_tag );
+ msgid = (tag != LBER_SEQUENCE) ? op->o_msgid : 0;
+
+#ifdef LDAP_CONNECTIONLESS
+ if ( op->o_cldap ) {
+ ber_pvt_sb_udp_set_dst( conn->c_sb, &op->o_clientaddr );
+ Debug( LDAP_DEBUG_TRACE, "UDP response to %s port %d\n",
+ inet_ntoa(((struct sockaddr_in *)
+ &op->o_clientaddr)->sin_addr ),
+ ((struct sockaddr_in *) &op->o_clientaddr)->sin_port,
+ 0 );
+ }
+#endif
+
+ send_ldap_response( conn, op, tag, msgid,
+ err, matched, text, refs,
+ rspoid, rspdata, NULL, ctrls );
+}
+
void
send_search_result(
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 );
+ text = tmp;
refs = NULL;
-
} else {
/* don't send references in search results */
assert( refs == NULL );
#ifdef LDAP_CONNECTIONLESS
if ( op->o_cldap ) {
- ber_pvt_sb_udp_set_dst( &conn->c_sb, &op->o_clientaddr );
+ ber_pvt_sb_udp_set_dst( conn->c_sb, &op->o_clientaddr );
Debug( LDAP_DEBUG_TRACE, "UDP response to %s port %d\n",
inet_ntoa(((struct sockaddr_in *)
&op->o_clientaddr)->sin_addr ),
send_ldap_response( conn, op, tag, msgid,
err, matched, text, refs,
- NULL, NULL, ctrls );
+ NULL, NULL, NULL, ctrls );
Statslog( LDAP_DEBUG_STATS,
"conn=%ld op=%ld SEARCH RESULT tag=%lu err=%ld text=%s\n",
(long) op->o_connid, (long) op->o_opid,
- (long) tag, (long) err, text );
+ (long) tag, (long) err, text ? text : "" );
+ if (tmp != NULL)
+ ch_free(tmp);
}
BerElement *ber;
Attribute *a;
int i, rc=-1, bytes;
- AccessControl *acl;
char *edn;
int userattrs;
int opattrs;
: charray_inlist( attrs, LDAP_ALL_OPERATIONAL_ATTRIBUTES );
for ( a = e->e_attrs; a != NULL; a = a->a_next ) {
- regmatch_t matches[MAXREMATCHES];
-
if ( attrs == NULL ) {
/* all addrs request, skip operational attributes */
if( !opattrs && oc_check_operational_attr( a->a_type ) ) {
}
}
- acl = acl_get_applicable( be, op, e, a->a_type,
- MAXREMATCHES, matches );
-
- if ( ! acl_access_allowed( acl, be, conn, e,
- NULL, op, ACL_READ, edn, matches ) )
+ if ( ! access_allowed( be, conn, op, e,
+ a->a_type, NULL, ACL_READ ) )
{
+ Debug( LDAP_DEBUG_ACL, "acl: access to attribute %s not allowed\n",
+ a->a_type, 0, 0 );
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_READ, edn, matches) )
+ if ( ! access_allowed( be, conn, op, e,
+ a->a_type, a->a_vals[i], ACL_READ ) )
{
+ Debug( LDAP_DEBUG_ACL,
+ "acl: access to attribute %s, value %d not allowed\n",
+ a->a_type, i, 0 );
continue;
}
a = backend_subschemasubentry( be );
do {
- regmatch_t matches[MAXREMATCHES];
-
if ( attrs == NULL ) {
/* all addrs request, skip operational attributes */
if( !opattrs && oc_check_operational_attr( a->a_type ) ) {
}
}
- acl = acl_get_applicable( be, op, e, a->a_type,
- MAXREMATCHES, matches );
-
- if ( ! acl_access_allowed( acl, be, conn, e,
- NULL, op, ACL_READ, edn, matches ) )
+ if ( ! access_allowed( be, conn, op, e,
+ a->a_type, NULL, ACL_READ ) )
{
+ Debug( LDAP_DEBUG_ACL, "acl: access to attribute %s not allowed\n",
+ a->a_type, 0, 0 );
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_READ, edn, matches) )
+ if ( ! access_allowed( be, conn, op, e,
+ a->a_type, a->a_vals[i], ACL_READ ) )
{
+ Debug( LDAP_DEBUG_ACL,
+ "acl: access to attribute %s, value %d not allowed\n",
+ a->a_type, i, 0 );
continue;
}
+
if (( rc = ber_printf( ber, "O", a->a_vals[i] )) == -1 ) {
Debug( LDAP_DEBUG_ANY,
"ber_printf failed\n", 0, 0, 0 );
}
bytes = send_ldap_ber( conn, ber );
+ ber_free( ber, 1 );
if ( bytes < 0 ) {
Debug( LDAP_DEBUG_ANY,
if( op->o_protocol < LDAP_VERSION3 ) {
/* save the references for the result */
- if( *refs == NULL ) {
+ if( *refs != NULL ) {
value_add( v2refs, refs );
}
return 0;
}
bytes = send_ldap_ber( conn, ber );
+ ber_free( ber, 1 );
ldap_pvt_thread_mutex_lock( &num_sent_mutex );
num_bytes_sent += bytes;
projects / openldap / blobdiff