/* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2010 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
*/
+#include "portable.h"
+
+#include <stdio.h>
+#include <ac/stdlib.h>
+
+#include <ac/socket.h>
+#include <ac/string.h>
+#include <ac/time.h>
+
+#include "ldap-int.h"
+#include "ldap_log.h"
+
/*
* LDAPv3 Extended Operation Request
* ExtendedRequest ::= [APPLICATION 23] SEQUENCE {
* response [11] OCTET STRING OPTIONAL
* }
*
+ * (Source RFC 4511)
*/
-#include "portable.h"
-
-#include <stdio.h>
-#include <ac/stdlib.h>
-
-#include <ac/socket.h>
-#include <ac/string.h>
-#include <ac/time.h>
-
-#include "ldap-int.h"
-#include "ldap_log.h"
-
int
ldap_extended_operation(
LDAP *ld,
int rc;
ber_int_t id;
-#ifdef NEW_LOGGING
- LDAP_LOG ( OPERATION, ENTRY, "ldap_extended_operation\n", 0,0,0 );
-#else
Debug( LDAP_DEBUG_TRACE, "ldap_extended_operation\n", 0, 0, 0 );
-#endif
assert( ld != NULL );
assert( LDAP_VALID( ld ) );
- assert( reqoid != NULL || *reqoid == '\0' );
+ assert( reqoid != NULL && *reqoid != '\0' );
assert( msgidp != NULL );
/* must be version 3 (or greater) */
int msgid;
LDAPMessage *res;
-#ifdef NEW_LOGGING
- LDAP_LOG ( OPERATION, ENTRY, "ldap_extended_operation_s\n", 0,0,0 );
-#else
Debug( LDAP_DEBUG_TRACE, "ldap_extended_operation_s\n", 0, 0, 0 );
-#endif
assert( ld != NULL );
assert( LDAP_VALID( ld ) );
- assert( reqoid != NULL || *reqoid == '\0' );
- assert( retoidp != NULL || retdatap != NULL );
+ assert( reqoid != NULL && *reqoid != '\0' );
rc = ldap_extended_operation( ld, reqoid, reqdata,
sctrls, cctrls, &msgid );
return( rc );
}
- if ( ldap_result( ld, msgid, 1, (struct timeval *) NULL, &res ) == -1 ) {
+ if ( ldap_result( ld, msgid, LDAP_MSG_ALL, (struct timeval *) NULL, &res ) == -1 || !res ) {
return( ld->ld_errno );
}
assert( LDAP_VALID( ld ) );
assert( res != NULL );
-#ifdef NEW_LOGGING
- LDAP_LOG ( OPERATION, ENTRY, "ldap_parse_extended_result\n", 0,0,0 );
-#else
Debug( LDAP_DEBUG_TRACE, "ldap_parse_extended_result\n", 0, 0, 0 );
-#endif
if( ld->ld_version < LDAP_VERSION3 ) {
ld->ld_errno = LDAP_NOT_SUPPORTED;
return ld->ld_errno;
}
- rc = ber_scanf( ber, "{iaa" /*}*/, &errcode,
+ rc = ber_scanf( ber, "{eAA" /*}*/, &errcode,
&ld->ld_matched, &ld->ld_error );
if( rc == LBER_ERROR ) {
return ld->ld_errno;
}
+ assert( resoid[ 0 ] != '\0' );
+
tag = ber_peek_tag( ber, &len );
}
int freeit )
{
BerElement *ber;
- ber_tag_t rc;
ber_tag_t tag;
ber_len_t len;
struct berval *resdata;
assert( LDAP_VALID( ld ) );
assert( res != NULL );
-#ifdef NEW_LOGGING
- LDAP_LOG ( OPERATION, ENTRY, "ldap_parse_intermediate\n", 0,0,0 );
-#else
Debug( LDAP_DEBUG_TRACE, "ldap_parse_intermediate\n", 0, 0, 0 );
-#endif
if( ld->ld_version < LDAP_VERSION3 ) {
ld->ld_errno = LDAP_NOT_SUPPORTED;
if( retoidp != NULL ) *retoidp = NULL;
if( retdatap != NULL ) *retdatap = NULL;
+ if( serverctrls != NULL ) *serverctrls = NULL;
ber = ber_dup( res->lm_ber );
return ld->ld_errno;
}
- rc = ber_scanf( ber, "{" /*}*/ );
+ tag = ber_scanf( ber, "{" /*}*/ );
- if( rc == LBER_ERROR ) {
+ if( tag == LBER_ERROR ) {
ld->ld_errno = LDAP_DECODING_ERROR;
ber_free( ber, 0 );
return ld->ld_errno;
tag = ber_peek_tag( ber, &len );
- if( tag == LDAP_TAG_EXOP_RES_OID ) {
+ /*
+ * NOTE: accept intermediate and extended response tag values
+ * as older versions of slapd(8) incorrectly used extended
+ * response tags.
+ * Should be removed when 2.2 is moved to Historic.
+ */
+ if( tag == LDAP_TAG_IM_RES_OID || tag == LDAP_TAG_EXOP_RES_OID ) {
/* we have a resoid */
if( ber_scanf( ber, "a", &resoid ) == LBER_ERROR ) {
ld->ld_errno = LDAP_DECODING_ERROR;
return ld->ld_errno;
}
+ assert( resoid[ 0 ] != '\0' );
+
tag = ber_peek_tag( ber, &len );
}
- if( tag == LDAP_TAG_EXOP_RES_VALUE ) {
+ if( tag == LDAP_TAG_IM_RES_VALUE || tag == LDAP_TAG_EXOP_RES_VALUE ) {
/* we have a resdata */
if( ber_scanf( ber, "O", &resdata ) == LBER_ERROR ) {
ld->ld_errno = LDAP_DECODING_ERROR;
}
if ( serverctrls == NULL ) {
- rc = LDAP_SUCCESS;
+ ld->ld_errno = LDAP_SUCCESS;
goto free_and_return;
}
if ( ber_scanf( ber, /*{*/ "}" ) == LBER_ERROR ) {
- rc = LDAP_DECODING_ERROR;
+ ld->ld_errno = LDAP_DECODING_ERROR;
goto free_and_return;
}
- rc = ldap_int_get_controls( ber, serverctrls );
+ ld->ld_errno = ldap_pvt_get_controls( ber, serverctrls );
free_and_return:
ber_free( ber, 0 );
ldap_msgfree( res );
}
- return LDAP_SUCCESS;
+ return ld->ld_errno;
}
-#if 0
-/* Parse an intermediate response result */
-int
-ldap_parse_intermediate_resp_result (
- LDAP *ld,
- LDAPMessage *res,
- char **retoidp,
- struct berval **retdatap,
- int freeit )
-{
- BerElement *ber;
- ber_tag_t rc;
- ber_tag_t tag;
- ber_len_t len;
- struct berval *resdata;
- ber_int_t errcode;
- char *resoid;
-
- assert( ld != NULL );
- assert( LDAP_VALID( ld ) );
- assert( res != NULL );
-
-#ifdef NEW_LOGGING
- LDAP_LOG ( OPERATION, ENTRY, "ldap_parse_intermediate_resp_result\n", 0,0,0 );
-#else
- Debug( LDAP_DEBUG_TRACE, "ldap_parse_intermediate_resp_result\n", 0, 0, 0 );
-#endif
-
- if( ld->ld_version < LDAP_VERSION3 ) {
- ld->ld_errno = LDAP_NOT_SUPPORTED;
- return ld->ld_errno;
- }
-
- if( res->lm_msgtype != LDAP_RES_INTERMEDIATE_RESP ) {
- ld->ld_errno = LDAP_PARAM_ERROR;
- return ld->ld_errno;
- }
-
- if( retoidp != NULL ) *retoidp = NULL;
- if( retdatap != NULL ) *retdatap = NULL;
-
- if ( ld->ld_error ) {
- LDAP_FREE( ld->ld_error );
- ld->ld_error = NULL;
- }
-
- if ( ld->ld_matched ) {
- LDAP_FREE( ld->ld_matched );
- ld->ld_matched = NULL;
- }
-
- ber = ber_dup( res->lm_ber );
-
- if ( ber == NULL ) {
- ld->ld_errno = LDAP_NO_MEMORY;
- return ld->ld_errno;
- }
-
- rc = ber_scanf( ber, "{iaa" /*}*/, &errcode,
- &ld->ld_matched, &ld->ld_error );
-
- if( rc == LBER_ERROR ) {
- ld->ld_errno = LDAP_DECODING_ERROR;
- ber_free( ber, 0 );
- return ld->ld_errno;
- }
-
- resoid = NULL;
- resdata = NULL;
-
- tag = ber_peek_tag( ber, &len );
-
- if( tag == LDAP_TAG_EXOP_RES_OID ) {
- /* we have a resoid */
- if( ber_scanf( ber, "a", &resoid ) == LBER_ERROR ) {
- ld->ld_errno = LDAP_DECODING_ERROR;
- ber_free( ber, 0 );
- return ld->ld_errno;
- }
-
- tag = ber_peek_tag( ber, &len );
- }
-
- if( tag == LDAP_TAG_EXOP_RES_VALUE ) {
- /* we have a resdata */
- if( ber_scanf( ber, "O", &resdata ) == LBER_ERROR ) {
- ld->ld_errno = LDAP_DECODING_ERROR;
- ber_free( ber, 0 );
- if( resoid != NULL ) LDAP_FREE( resoid );
- return ld->ld_errno;
- }
- }
-
- ber_free( ber, 0 );
-
- if( retoidp != NULL ) {
- *retoidp = resoid;
- } else {
- LDAP_FREE( resoid );
- }
-
- if( retdatap != NULL ) {
- *retdatap = resdata;
- } else {
- ber_bvfree( resdata );
- }
-
- ld->ld_errno = errcode;
-
- if( freeit ) {
- ldap_msgfree( res );
- }
-
- return LDAP_SUCCESS;
-}
-#endif
projects / openldap / blobdiff