/* $OpenLDAP$ */
/*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file
*/
/* Portions
re_encode_request( LDAP *ld,
BerElement *origber,
ber_int_t msgid,
+ int sref,
LDAPURLDesc *srv,
int *type );
}
Debug( LDAP_DEBUG_TRACE,
- "ldap_delayed_open successful, ld_host is %s\n",
- ( ld->ld_host == NULL ) ? "(null)" : ld->ld_host, 0, 0 );
+ "ldap_open_defconn: successful\n",
+ 0, 0, 0 );
}
{
servers = NULL;
}
+#ifdef LDAP_CONNECTIONLESS
+ if (LDAP_IS_UDP(ld)) {
+ if (msgtype == LDAP_REQ_BIND) {
+ if (ld->ld_options.ldo_cldapdn)
+ ldap_memfree(ld->ld_options.ldo_cldapdn);
+ ld->ld_options.ldo_cldapdn = ldap_strdup(dn);
+ return 0;
+ }
+ if (msgtype != LDAP_REQ_ABANDON && msgtype != LDAP_REQ_SEARCH)
+ return LDAP_PARAM_ERROR;
+ }
+#endif
rc = ldap_send_server_request( ld, ber, ld->ld_msgid, NULL,
servers, NULL, NULL );
if (servers)
lr->lr_origid = parentreq->lr_origid;
lr->lr_parentcnt = parentreq->lr_parentcnt + 1;
lr->lr_parent = parentreq;
- lr->lr_refnext = parentreq->lr_refnext;
- parentreq->lr_refnext = lr;
+ lr->lr_refnext = parentreq->lr_child;
+ parentreq->lr_child = lr;
} else { /* original request */
lr->lr_origid = lr->lr_msgid;
}
*/
lc->lconn_rebind_inprogress = 1;
/* V3 rebind function */
- if ( ld->ld_rebindproc != NULL) {
+ if ( ld->ld_rebind_proc != NULL) {
LDAPURLDesc *srvfunc;
if( ( srvfunc = ldap_url_dup( srvlist)) == NULL) {
ld->ld_errno = LDAP_NO_MEMORY;
++lc->lconn_refcnt; /* avoid premature free */
ld->ld_defconn = lc;
- Debug( LDAP_DEBUG_TRACE, "Call application rebindproc\n", 0, 0, 0);
- err = (*ld->ld_rebindproc)( ld, bind->ri_url, bind->ri_request, bind->ri_msgid);
+ Debug( LDAP_DEBUG_TRACE, "Call application rebind_proc\n", 0, 0, 0);
+ err = (*ld->ld_rebind_proc)( ld,
+ bind->ri_url, bind->ri_request, bind->ri_msgid,
+ ld->ld_rebind_params );
ld->ld_defconn = savedefconn;
--lc->lconn_refcnt;
}
#endif /* LDAP_DEBUG */
-
void
-ldap_free_request( LDAP *ld, LDAPRequest *lr )
+ldap_free_request_int( LDAP *ld, LDAPRequest *lr )
{
- LDAPRequest *tmplr, *nextlr;
-
- Debug( LDAP_DEBUG_TRACE, "ldap_free_request (origid %d, msgid %d)\n",
- lr->lr_origid, lr->lr_msgid, 0 );
-
- if ( lr->lr_parent != NULL ) {
- --lr->lr_parent->lr_outrefcnt;
- } else {
- /* free all referrals (child requests) */
- for ( tmplr = lr->lr_refnext; tmplr != NULL; tmplr = nextlr ) {
- nextlr = tmplr->lr_refnext;
- ldap_free_request( ld, tmplr );
- }
- }
-
if ( lr->lr_prev == NULL ) {
ld->ld_requests = lr->lr_next;
} else {
LDAP_FREE( lr );
}
+void
+ldap_free_request( LDAP *ld, LDAPRequest *lr )
+{
+ LDAPRequest **ttmplr;
+
+ Debug( LDAP_DEBUG_TRACE, "ldap_free_request (origid %d, msgid %d)\n",
+ lr->lr_origid, lr->lr_msgid, 0 );
+
+ if ( lr->lr_parent != NULL ) {
+ --lr->lr_parent->lr_outrefcnt;
+ for ( ttmplr = &lr->lr_parent->lr_child; *ttmplr && *ttmplr != lr; ttmplr = &(*ttmplr)->lr_refnext );
+ if ( *ttmplr == lr )
+ *ttmplr = lr->lr_refnext;
+ } else {
+ /* free all referrals (child requests) */
+ while ( lr->lr_child )
+ ldap_free_request( ld, lr->lr_child );
+ }
+ ldap_free_request_int( ld, lr );
+}
+
+
/*
* Chase v3 referrals
*
}
/* find original request */
- for ( origreq = lr; origreq->lr_parent != NULL; origreq = origreq->lr_parent ) {
- ;
+ for ( origreq = lr;
+ origreq->lr_parent != NULL;
+ origreq = origreq->lr_parent )
+ {
+ /* empty */ ;
}
refarray = refs;
/* parse out & follow referrals */
for( i=0; refarray[i] != NULL; i++) {
/* Parse the referral URL */
- if (( rc = ldap_url_parse( refarray[i], &srv)) != LDAP_SUCCESS) {
+ if (( rc = ldap_url_parse_ext( refarray[i], &srv)) != LDAP_SUCCESS) {
ld->ld_errno = rc;
rc = -1;
goto done;
* if two search references come in one behind the other
* for the same server with different contexts.
*/
- Debug( LDAP_DEBUG_TRACE, "ldap_chase_v3referrals: queue referral \"%s\"\n",
+ Debug( LDAP_DEBUG_TRACE,
+ "ldap_chase_v3referrals: queue referral \"%s\"\n",
refarray[i], 0, 0);
if( lc->lconn_rebind_queue == NULL ) {
/* Create a referral list */
- if( (lc->lconn_rebind_queue = (char ***)LDAP_MALLOC( sizeof(void *) * 2)) == NULL) {
+ lc->lconn_rebind_queue =
+ (char ***) LDAP_MALLOC( sizeof(void *) * 2);
+
+ if( lc->lconn_rebind_queue == NULL) {
ld->ld_errno = LDAP_NO_MEMORY;
rc = -1;
goto done;
}
+
lc->lconn_rebind_queue[0] = refarray;
lc->lconn_rebind_queue[1] = NULL;
refarray = NULL;
+
} else {
/* Count how many referral arrays we already have */
for( j = 0; lc->lconn_rebind_queue[j] != NULL; j++) {
- ;
+ /* empty */;
}
+
/* Add the new referral to the list */
- if( (lc->lconn_rebind_queue = (char ***)LDAP_REALLOC(
- lc->lconn_rebind_queue, sizeof(void *) * (j + 2))) == NULL) {
+ lc->lconn_rebind_queue = (char ***) LDAP_REALLOC(
+ lc->lconn_rebind_queue, sizeof(void *) * (j + 2));
+
+ if( lc->lconn_rebind_queue == NULL ) {
ld->ld_errno = LDAP_NO_MEMORY;
rc = -1;
goto done;
lc->lconn_rebind_queue[j+1] = NULL;
refarray = NULL;
}
+
/* We have queued the referral/reference, now just return */
rc = 0;
*hadrefp = 1;
srv->lud_dn = LDAP_STRDUP( "" );
}
- if (( ber = re_encode_request( ld, origreq->lr_ber,
- ++ld->ld_msgid, srv, &rinfo.ri_request )) == NULL ) {
+ ber = re_encode_request( ld, origreq->lr_ber, ++ld->ld_msgid,
+ sref, srv, &rinfo.ri_request );
+
+ if( ber == NULL ) {
ld->ld_errno = LDAP_ENCODING_ERROR;
rc = -1;
goto done;
}
- Debug( LDAP_DEBUG_TRACE, "ldap_chase_v3referral: msgid %d, url \"%s\"\n",
+ Debug( LDAP_DEBUG_TRACE,
+ "ldap_chase_v3referral: msgid %d, url \"%s\"\n",
lr->lr_msgid, refarray[i], 0);
/* Send the new request to the server - may require a bind */
* XXX merging of errors in this routine needs to be improved
*/
int
-ldap_chase_referrals( LDAP *ld, LDAPRequest *lr, char **errstrp, int *hadrefp )
+ldap_chase_referrals( LDAP *ld,
+ LDAPRequest *lr,
+ char **errstrp,
+ int sref,
+ int *hadrefp )
{
int rc, count, len;
char *p, *ref, *unfollowed;
*hadrefp = 1;
ber = re_encode_request( ld, origreq->lr_ber,
- ++ld->ld_msgid, srv, &rinfo.ri_request );
+ ++ld->ld_msgid, sref, srv, &rinfo.ri_request );
if( ber == NULL ) {
return -1 ;
re_encode_request( LDAP *ld,
BerElement *origber,
ber_int_t msgid,
+ int sref,
LDAPURLDesc *srv,
int *type )
{
/* search requests need to be re-scope-ed */
rc = ber_scanf( &tmpber, "{ae" /*"}"*/, &orig_dn, &scope );
- if( srv->lud_scope == LDAP_SCOPE_DEFAULT &&
- scope != LDAP_SCOPE_SUBTREE )
- {
+ if( srv->lud_scope != LDAP_SCOPE_DEFAULT ) {
+ /* use the scope provided in reference */
+ scope = srv->lud_scope;
+
+ } else if ( sref && scope != LDAP_SCOPE_SUBTREE ) {
+ /* use scope implied by previous operation */
+ /* base -> base */
+ /* one -> base */
+ /* subtree -> subtree */
scope = LDAP_SCOPE_BASE;
- }
+ }
} else {
rc = ber_scanf( &tmpber, "{a" /*}*/, &orig_dn );
projects / openldap / blobdiff