mirror of
https://git.openldap.org/openldap/openldap.git
synced 2025-12-21 23:29: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.
236 lines
5 KiB
C
236 lines
5 KiB
C
/*
|
|
* Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
|
|
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file
|
|
*/
|
|
/* Portions
|
|
* Copyright (c) 1990 Regents of the University of Michigan.
|
|
* All rights reserved.
|
|
*
|
|
* abandon.c
|
|
*/
|
|
|
|
#include "portable.h"
|
|
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
|
|
#include <ac/socket.h>
|
|
#include <ac/string.h>
|
|
#include <ac/time.h>
|
|
|
|
#include "ldap-int.h"
|
|
|
|
static int do_abandon LDAP_P((
|
|
LDAP *ld,
|
|
int origid,
|
|
int msgid,
|
|
LDAPControl **sctrls,
|
|
LDAPControl **cctrls));
|
|
|
|
/*
|
|
* ldap_abandon_ext - perform an ldap extended abandon operation.
|
|
*
|
|
* Parameters:
|
|
* ld LDAP descriptor
|
|
* msgid The message id of the operation to abandon
|
|
* scntrls Server Controls
|
|
* ccntrls Client Controls
|
|
*
|
|
* ldap_abandon_ext returns a LDAP error code.
|
|
* (LDAP_SUCCESS if everything went ok)
|
|
*
|
|
* Example:
|
|
* ldap_abandon_ext( ld, msgid, scntrls, ccntrls );
|
|
*/
|
|
int
|
|
ldap_abandon_ext(
|
|
LDAP *ld,
|
|
int msgid,
|
|
LDAPControl **sctrls,
|
|
LDAPControl **cctrls )
|
|
{
|
|
Debug( LDAP_DEBUG_TRACE, "ldap_abandon_ext %d\n", msgid, 0, 0 );
|
|
|
|
return do_abandon( ld, msgid, msgid, sctrls, cctrls );
|
|
}
|
|
|
|
|
|
/*
|
|
* ldap_abandon - perform an ldap abandon operation. Parameters:
|
|
*
|
|
* ld LDAP descriptor
|
|
* msgid The message id of the operation to abandon
|
|
*
|
|
* ldap_abandon returns 0 if everything went ok, -1 otherwise.
|
|
*
|
|
* Example:
|
|
* ldap_abandon( ld, msgid );
|
|
*/
|
|
int
|
|
ldap_abandon( LDAP *ld, int msgid )
|
|
{
|
|
Debug( LDAP_DEBUG_TRACE, "ldap_abandon %d\n", msgid, 0, 0 );
|
|
return do_abandon( ld, msgid, msgid, NULL, NULL ) == LDAP_SUCCESS
|
|
? 0 : -1;
|
|
}
|
|
|
|
|
|
static int
|
|
do_abandon(
|
|
LDAP *ld,
|
|
int origid,
|
|
int msgid,
|
|
LDAPControl **sctrls,
|
|
LDAPControl **cctrls)
|
|
{
|
|
BerElement *ber;
|
|
int i, err, sendabandon;
|
|
Sockbuf *sb;
|
|
#ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS
|
|
LDAPRequest *lr;
|
|
#endif /* LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS */
|
|
|
|
/*
|
|
* An abandon request looks like this:
|
|
* AbandonRequest ::= MessageID
|
|
*/
|
|
|
|
Debug( LDAP_DEBUG_TRACE, "do_abandon origid %d, msgid %d\n",
|
|
origid, msgid, 0 );
|
|
|
|
sendabandon = 1;
|
|
|
|
#ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS
|
|
/* find the request that we are abandoning */
|
|
for ( lr = ld->ld_requests; lr != NULL; lr = lr->lr_next ) {
|
|
if ( lr->lr_msgid == msgid ) { /* this message */
|
|
break;
|
|
}
|
|
if ( lr->lr_origid == msgid ) {/* child: abandon it */
|
|
(void) do_abandon( ld,
|
|
msgid, lr->lr_msgid, sctrls, cctrls );
|
|
}
|
|
}
|
|
|
|
if ( lr != NULL ) {
|
|
if ( origid == msgid && lr->lr_parent != NULL ) {
|
|
/* don't let caller abandon child requests! */
|
|
ld->ld_errno = LDAP_PARAM_ERROR;
|
|
return( LDAP_PARAM_ERROR );
|
|
}
|
|
if ( lr->lr_status != LDAP_REQST_INPROGRESS ) {
|
|
/* no need to send abandon message */
|
|
sendabandon = 0;
|
|
}
|
|
}
|
|
#endif /* LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS */
|
|
|
|
if ( ldap_msgdelete( ld, msgid ) == 0 ) {
|
|
ld->ld_errno = LDAP_SUCCESS;
|
|
return LDAP_SUCCESS;
|
|
}
|
|
|
|
err = 0;
|
|
if ( sendabandon ) {
|
|
/* create a message to send */
|
|
if ( (ber = ldap_alloc_ber_with_options( ld )) == NULLBER ) {
|
|
err = -1;
|
|
ld->ld_errno = LDAP_NO_MEMORY;
|
|
|
|
} else {
|
|
#ifdef LDAP_CONNECTIONLESS
|
|
if ( ld->ld_cldapnaddr > 0 ) {
|
|
err = ber_printf( ber, "{isti", /* leave open '}' */
|
|
++ld->ld_msgid, ld->ld_cldapdn,
|
|
LDAP_REQ_ABANDON, msgid );
|
|
} else
|
|
#endif /* LDAP_CONNECTIONLESS */
|
|
{
|
|
err = ber_printf( ber, "{iti", /* leave open '}' */
|
|
++ld->ld_msgid,
|
|
LDAP_REQ_ABANDON, msgid );
|
|
}
|
|
|
|
if( err == -1 ) {
|
|
/* encoding error */
|
|
ld->ld_errno = LDAP_ENCODING_ERROR;
|
|
|
|
} else {
|
|
/* Put Server Controls */
|
|
if ( ldap_int_put_controls( ld, sctrls, ber )
|
|
!= LDAP_SUCCESS )
|
|
{
|
|
err = -1;
|
|
|
|
} else {
|
|
/* close '{' */
|
|
err = ber_printf( ber, "}" );
|
|
|
|
if( err == -1 ) {
|
|
/* encoding error */
|
|
ld->ld_errno = LDAP_ENCODING_ERROR;
|
|
}
|
|
}
|
|
}
|
|
|
|
if ( err == -1 ) {
|
|
ber_free( ber, 1 );
|
|
|
|
} else {
|
|
/* send the message */
|
|
#ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS
|
|
if ( lr != NULL ) {
|
|
sb = lr->lr_conn->lconn_sb;
|
|
} else
|
|
#endif /* LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS */
|
|
{
|
|
sb = &ld->ld_sb;
|
|
}
|
|
|
|
if ( ber_flush( sb, ber, 1 ) != 0 ) {
|
|
ld->ld_errno = LDAP_SERVER_DOWN;
|
|
err = -1;
|
|
} else {
|
|
err = 0;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
#ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS
|
|
if ( lr != NULL ) {
|
|
if ( sendabandon ) {
|
|
ldap_free_connection( ld, lr->lr_conn, 0, 1 );
|
|
}
|
|
if ( origid == msgid ) {
|
|
ldap_free_request( ld, lr );
|
|
}
|
|
}
|
|
#endif /* LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS */
|
|
|
|
|
|
if ( ld->ld_abandoned == NULL ) {
|
|
if ( (ld->ld_abandoned = (int *) malloc( 2 * sizeof(int) ))
|
|
== NULL ) {
|
|
ld->ld_errno = LDAP_NO_MEMORY;
|
|
return( ld->ld_errno );
|
|
}
|
|
i = 0;
|
|
} else {
|
|
for ( i = 0; ld->ld_abandoned[i] != -1; i++ )
|
|
; /* NULL */
|
|
if ( (ld->ld_abandoned = (int *) realloc( (char *)
|
|
ld->ld_abandoned, (i + 2) * sizeof(int) )) == NULL ) {
|
|
ld->ld_errno = LDAP_NO_MEMORY;
|
|
return( ld->ld_errno );
|
|
}
|
|
}
|
|
ld->ld_abandoned[i] = msgid;
|
|
ld->ld_abandoned[i + 1] = -1;
|
|
|
|
if ( err != -1 ) {
|
|
ld->ld_errno = LDAP_SUCCESS;
|
|
}
|
|
|
|
return( ld->ld_errno );
|
|
}
|