mirror of
https://git.openldap.org/openldap/openldap.git
synced 2025-12-28 10:39:34 -05:00
This commit includes many changes. All changes compile under NT but
have not been tested under UNIX.
A Summary of changes (likely incomplete):
NT changes:
Removed lint.
Clean up configuration support for "Debug", "Release", "SDebug",
and "SRelease" configurations.
Share output directories for clients, libraries,
and slapd. (maybe they should be combined further
and moved to build/{,S}{Debug,Release}).
Enable threading when _MT is defined.
Enable debuging when _DEBUG is defined.
Disable setting of NDEBUG under Release/SRelease. Asserts
are disabled in <ac/assert.h> when LDAP_DEBUG is not
defined.
Added 'build/main.dsp' Master project.
Removed non-slapd projects from slapd.dsp (see main.dsp).
Removed replaced many uses of _WIN32 macro with feature based
macros.
ldap_cdefs.h changes
#define LDAP_CONST const
(see below)
#define LDAP_F(type) LDAP_F_PRE type LDAP_F_POST
To allow specifiers to be added before and after
the type declaration. (For DLL handling)
LBER/LDAP changes
Namespace changes:
s/lber_/ber_/ for here and there.
s/NAME_ERROR/LDAP_NAME_ERROR/g
Deleted NULLMSG and other NULL* macros for namespace reasons.
"const" libraries. Installed headers (ie: lber.h, ldap.h)
use LDAP_CONST macro. Normally set to 'const' when
__STDC__. Can be set externally to enable/disable
'constification' of external interface. Internal
interface always uses 'const'. Did not fix warnings
in -lldif (in lieu of new LDIF parser).
Added _ext API implementations (excepting search and bind).
Need to implement ldap_int_get_controls() for reponses
with controls.
Added numberous assert() checks.
LDAP_R
_MT defines HAVE_NT_THREADS
Added numberous assert() checks.
Changed ldap_pthread_t back to unsigned long. Used cast
to HANDLE in _join().
LDBM
Replaced _WIN32 with HAVE_SYSLOG
ud
Added version string if MKVERSION is not defined. (MKVERSION
needs to be set under UNIX).
slapd
Made connection sockbuf field a pointer to a sockbuf. This
removed slap.h dependency on lber-int.h. lber-int.h now only
included by those files needing to mess with the sockbuf.
Used ber_* functions/macros to access sockbuf internals whenever
possible.
Added version string if MKVERSION is not defined. (MKVERSION
needs to be set under UNIX).
Removed FD_SET unsigned lint
slapd/tools
Used EXEEXT to added ".exe" to routines. Need to define EXEEXT
under UNIX.
ldappasswd
Added ldappasswd.dsp. Ported to NT. Used getpid() to seed rand().
nt_debug
Minor cleanup. Added "portable.h" include and used <ac/*.h> where
appropriate. Added const to char* format argument.
453 lines
10 KiB
C
453 lines
10 KiB
C
/* result.c - routines to send ldap results, errors, and referrals */
|
|
|
|
#include "portable.h"
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <ac/socket.h>
|
|
#include <ac/errno.h>
|
|
#include <ac/signal.h>
|
|
#include <ac/string.h>
|
|
#include <ac/time.h>
|
|
#include <ac/unistd.h> /* get close() */
|
|
|
|
#include "slap.h"
|
|
|
|
/* we need LBER internals */
|
|
#include "../../libraries/liblber/lber-int.h"
|
|
|
|
static void
|
|
send_ldap_result2(
|
|
Connection *conn,
|
|
Operation *op,
|
|
int err,
|
|
char *matched,
|
|
char *text,
|
|
int nentries
|
|
)
|
|
{
|
|
BerElement *ber;
|
|
int rc;
|
|
unsigned long tag, bytes;
|
|
|
|
if ( err == LDAP_PARTIAL_RESULTS && (text == NULL || *text == '\0') )
|
|
err = LDAP_NO_SUCH_OBJECT;
|
|
|
|
Debug( LDAP_DEBUG_TRACE, "send_ldap_result %d:%s:%s\n", err,
|
|
matched ? matched : "",
|
|
text ? text : "" );
|
|
|
|
switch ( op->o_tag ) {
|
|
case LBER_DEFAULT:
|
|
tag = LBER_SEQUENCE;
|
|
break;
|
|
|
|
case LDAP_REQ_SEARCH:
|
|
tag = LDAP_RES_SEARCH_RESULT;
|
|
break;
|
|
|
|
case LDAP_REQ_DELETE:
|
|
tag = LDAP_RES_DELETE;
|
|
break;
|
|
|
|
default:
|
|
tag = op->o_tag + 1;
|
|
break;
|
|
}
|
|
|
|
|
|
#ifdef LDAP_COMPAT30
|
|
if ( (ber = ber_alloc_t( conn->c_version == 30 ? 0 : LBER_USE_DER ))
|
|
== NULLBER )
|
|
#else
|
|
if ( (ber = der_alloc()) == NULLBER )
|
|
#endif
|
|
{
|
|
Debug( LDAP_DEBUG_ANY, "ber_alloc failed\n", 0, 0, 0 );
|
|
return;
|
|
}
|
|
|
|
#ifdef LDAP_CONNECTIONLESS
|
|
if ( op->o_cldap ) {
|
|
rc = ber_printf( ber, "{is{t{ess}}}", op->o_msgid, "", tag,
|
|
err, matched ? matched : "", text ? text : "" );
|
|
} else
|
|
#endif
|
|
#ifdef LDAP_COMPAT30
|
|
if ( conn->c_version == 30 ) {
|
|
rc = ber_printf( ber, "{it{{ess}}}", op->o_msgid, tag, err,
|
|
matched ? matched : "", text ? text : "" );
|
|
} else
|
|
#endif
|
|
rc = ber_printf( ber, "{it{ess}}", op->o_msgid, tag, err,
|
|
matched ? matched : "", text ? text : "" );
|
|
|
|
if ( rc == -1 ) {
|
|
Debug( LDAP_DEBUG_ANY, "ber_printf failed\n", 0, 0, 0 );
|
|
return;
|
|
}
|
|
|
|
/* write only one pdu at a time - wait til it's our turn */
|
|
ldap_pvt_thread_mutex_lock( &conn->c_write_mutex );
|
|
|
|
/* lock the connection */
|
|
ldap_pvt_thread_mutex_lock( &conn->c_mutex );
|
|
|
|
/* write the pdu */
|
|
bytes = ber->ber_ptr - ber->ber_buf;
|
|
|
|
while ( 1 ) {
|
|
int err;
|
|
|
|
if ( connection_state_closing( conn ) ) {
|
|
ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
|
|
ldap_pvt_thread_mutex_unlock( &conn->c_write_mutex );
|
|
return;
|
|
}
|
|
|
|
if ( ber_flush( conn->c_sb, ber, 1 ) == 0 ) {
|
|
break;
|
|
}
|
|
|
|
err = errno;
|
|
|
|
/*
|
|
* we got an error. if it's ewouldblock, we need to
|
|
* wait on the socket being writable. otherwise, figure
|
|
* 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 );
|
|
|
|
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;
|
|
}
|
|
|
|
/* wait for socket to be write-ready */
|
|
conn->c_writewaiter = 1;
|
|
slapd_set_write( ber_pvt_sb_get_desc( conn->c_sb ), 1 );
|
|
|
|
ldap_pvt_thread_cond_wait( &conn->c_write_cv, &conn->c_mutex );
|
|
conn->c_writewaiter = 0;
|
|
}
|
|
|
|
ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
|
|
ldap_pvt_thread_mutex_unlock( &conn->c_write_mutex );
|
|
|
|
ldap_pvt_thread_mutex_lock( &num_sent_mutex );
|
|
num_bytes_sent += bytes;
|
|
ldap_pvt_thread_mutex_unlock( &num_sent_mutex );
|
|
|
|
Statslog( LDAP_DEBUG_STATS,
|
|
"conn=%d op=%d RESULT err=%d tag=%lu nentries=%d\n", conn->c_connid,
|
|
op->o_opid, err, tag, nentries );
|
|
|
|
return;
|
|
}
|
|
|
|
void
|
|
send_ldap_result(
|
|
Connection *conn,
|
|
Operation *op,
|
|
int err,
|
|
char *matched,
|
|
char *text
|
|
)
|
|
{
|
|
#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_result2( conn, op, err, matched, text, 0 );
|
|
}
|
|
|
|
void
|
|
send_ldap_search_result(
|
|
Connection *conn,
|
|
Operation *op,
|
|
int err,
|
|
char *matched,
|
|
char *text,
|
|
int nentries
|
|
)
|
|
{
|
|
send_ldap_result2( conn, op, err, matched, text, nentries );
|
|
}
|
|
|
|
int
|
|
send_search_entry(
|
|
Backend *be,
|
|
Connection *conn,
|
|
Operation *op,
|
|
Entry *e,
|
|
char **attrs,
|
|
int attrsonly
|
|
)
|
|
{
|
|
BerElement *ber;
|
|
Attribute *a;
|
|
int i, rc=-1, bytes;
|
|
struct acl *acl;
|
|
char *edn;
|
|
|
|
Debug( LDAP_DEBUG_TRACE, "=> send_search_entry (%s)\n", e->e_dn, 0, 0 );
|
|
|
|
if ( ! access_allowed( be, conn, op, e,
|
|
"entry", NULL, ACL_READ ) )
|
|
{
|
|
Debug( LDAP_DEBUG_ACL, "acl: access to entry not allowed\n",
|
|
0, 0, 0 );
|
|
return( 1 );
|
|
}
|
|
|
|
edn = e->e_ndn;
|
|
|
|
#ifdef LDAP_COMPAT30
|
|
if ( (ber = ber_alloc_t( conn->c_version == 30 ? 0 : LBER_USE_DER ))
|
|
== NULLBER )
|
|
#else
|
|
if ( (ber = der_alloc()) == NULLBER )
|
|
#endif
|
|
{
|
|
Debug( LDAP_DEBUG_ANY, "ber_alloc failed\n", 0, 0, 0 );
|
|
send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR, NULL,
|
|
"ber_alloc" );
|
|
goto error_return;
|
|
}
|
|
|
|
#ifdef LDAP_COMPAT30
|
|
if ( conn->c_version == 30 ) {
|
|
rc = ber_printf( ber, "{it{{s{", op->o_msgid,
|
|
LDAP_RES_SEARCH_ENTRY, e->e_dn );
|
|
} else
|
|
#endif
|
|
{
|
|
rc = ber_printf( ber, "{it{s{", op->o_msgid,
|
|
LDAP_RES_SEARCH_ENTRY, e->e_dn );
|
|
}
|
|
|
|
if ( rc == -1 ) {
|
|
Debug( LDAP_DEBUG_ANY, "ber_printf failed\n", 0, 0, 0 );
|
|
ber_free( ber, 1 );
|
|
send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR, NULL,
|
|
"ber_printf dn" );
|
|
goto error_return;
|
|
}
|
|
|
|
for ( a = e->e_attrs; a != NULL; a = a->a_next ) {
|
|
regmatch_t matches[MAXREMATCHES];
|
|
|
|
if ( attrs != NULL && ! charray_inlist( attrs, a->a_type ) ) {
|
|
continue;
|
|
}
|
|
|
|
/* the lastmod attributes are ignored by ACL checking */
|
|
if ( strcasecmp( a->a_type, "modifiersname" ) == 0 ||
|
|
strcasecmp( a->a_type, "modifytimestamp" ) == 0 ||
|
|
strcasecmp( a->a_type, "creatorsname" ) == 0 ||
|
|
strcasecmp( a->a_type, "createtimestamp" ) == 0 )
|
|
{
|
|
Debug( LDAP_DEBUG_ACL, "LASTMOD attribute: %s access DEFAULT\n",
|
|
a->a_type, 0, 0 );
|
|
acl = NULL;
|
|
} else {
|
|
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 ) )
|
|
{
|
|
continue;
|
|
}
|
|
|
|
if (( rc = ber_printf( ber, "{s[", a->a_type )) == -1 ) {
|
|
Debug( LDAP_DEBUG_ANY, "ber_printf failed\n", 0, 0, 0 );
|
|
ber_free( ber, 1 );
|
|
send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR,
|
|
NULL, "ber_printf type" );
|
|
goto error_return;
|
|
}
|
|
|
|
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) )
|
|
{
|
|
continue;
|
|
}
|
|
|
|
if (( rc = ber_printf( ber, "o",
|
|
a->a_vals[i]->bv_val,
|
|
a->a_vals[i]->bv_len )) == -1 )
|
|
{
|
|
Debug( LDAP_DEBUG_ANY,
|
|
"ber_printf failed\n", 0, 0, 0 );
|
|
ber_free( ber, 1 );
|
|
send_ldap_result( conn, op,
|
|
LDAP_OPERATIONS_ERROR, NULL,
|
|
"ber_printf value" );
|
|
goto error_return;
|
|
}
|
|
}
|
|
}
|
|
|
|
if (( rc = ber_printf( ber, "]}" )) == -1 ) {
|
|
Debug( LDAP_DEBUG_ANY, "ber_printf failed\n", 0, 0, 0 );
|
|
ber_free( ber, 1 );
|
|
send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR,
|
|
NULL, "ber_printf type end" );
|
|
goto error_return;
|
|
}
|
|
}
|
|
|
|
#ifdef LDAP_COMPAT30
|
|
if ( conn->c_version == 30 ) {
|
|
rc = ber_printf( ber, "}}}}" );
|
|
} else
|
|
#endif
|
|
rc = ber_printf( ber, "}}}" );
|
|
|
|
if ( rc == -1 ) {
|
|
Debug( LDAP_DEBUG_ANY, "ber_printf failed\n", 0, 0, 0 );
|
|
ber_free( ber, 1 );
|
|
send_ldap_result( conn, op, LDAP_OPERATIONS_ERROR, NULL,
|
|
"ber_printf entry end" );
|
|
return( 1 );
|
|
}
|
|
|
|
bytes = ber->ber_ptr - ber->ber_buf;
|
|
|
|
/* write only one pdu at a time - wait til it's our turn */
|
|
ldap_pvt_thread_mutex_lock( &conn->c_write_mutex );
|
|
|
|
/* lock the connection */
|
|
ldap_pvt_thread_mutex_lock( &conn->c_mutex );
|
|
|
|
/* write the pdu */
|
|
while( 1 ) {
|
|
int err;
|
|
|
|
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 ) {
|
|
break;
|
|
}
|
|
|
|
err = errno;
|
|
|
|
/*
|
|
* we got an error. if it's ewouldblock, we need to
|
|
* wait on the socket being writable. otherwise, figure
|
|
* 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 );
|
|
|
|
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 );
|
|
}
|
|
|
|
/* wait for socket to be write-ready */
|
|
conn->c_writewaiter = 1;
|
|
slapd_set_write( ber_pvt_sb_get_desc( conn->c_sb ), 1 );
|
|
|
|
ldap_pvt_thread_cond_wait( &conn->c_write_cv, &conn->c_mutex );
|
|
conn->c_writewaiter = 0;
|
|
}
|
|
|
|
ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
|
|
ldap_pvt_thread_mutex_unlock( &conn->c_write_mutex );
|
|
|
|
ldap_pvt_thread_mutex_lock( &num_sent_mutex );
|
|
num_bytes_sent += bytes;
|
|
num_entries_sent++;
|
|
ldap_pvt_thread_mutex_unlock( &num_sent_mutex );
|
|
|
|
Statslog( LDAP_DEBUG_STATS2, "conn=%d op=%d ENTRY dn=\"%s\"\n",
|
|
conn->c_connid, op->o_opid, e->e_dn, 0, 0 );
|
|
|
|
Debug( LDAP_DEBUG_TRACE, "<= send_search_entry\n", 0, 0, 0 );
|
|
|
|
rc = 0;
|
|
|
|
error_return:;
|
|
return( rc );
|
|
}
|
|
|
|
int
|
|
str2result(
|
|
char *s,
|
|
int *code,
|
|
char **matched,
|
|
char **info
|
|
)
|
|
{
|
|
int rc;
|
|
char *c;
|
|
|
|
*code = LDAP_SUCCESS;
|
|
*matched = NULL;
|
|
*info = NULL;
|
|
|
|
if ( strncasecmp( s, "RESULT", 6 ) != 0 ) {
|
|
Debug( LDAP_DEBUG_ANY, "str2result (%s) expecting \"RESULT\"\n",
|
|
s, 0, 0 );
|
|
|
|
return( -1 );
|
|
}
|
|
|
|
rc = 0;
|
|
while ( (s = strchr( s, '\n' )) != NULL ) {
|
|
*s++ = '\0';
|
|
if ( *s == '\0' ) {
|
|
break;
|
|
}
|
|
if ( (c = strchr( s, ':' )) != NULL ) {
|
|
c++;
|
|
}
|
|
|
|
if ( strncasecmp( s, "code", 4 ) == 0 ) {
|
|
if ( c != NULL ) {
|
|
*code = atoi( c );
|
|
}
|
|
} else if ( strncasecmp( s, "matched", 7 ) == 0 ) {
|
|
if ( c != NULL ) {
|
|
*matched = c;
|
|
}
|
|
} else if ( strncasecmp( s, "info", 4 ) == 0 ) {
|
|
if ( c != NULL ) {
|
|
*info = c;
|
|
}
|
|
} else {
|
|
Debug( LDAP_DEBUG_ANY, "str2result (%s) unknown\n",
|
|
s, 0, 0 );
|
|
rc = -1;
|
|
}
|
|
}
|
|
|
|
return( rc );
|
|
}
|