X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap%2Fextended.c;h=f42afd281aaba1e3856b81ac6635ecf346905371;hb=bcf8f7eeb788faa25efe0ea78e66e83e9d9b4d73;hp=72657c3476a84cd4af62f66bc2c765fa06cd2017;hpb=48c8aa035d5711655dfabecdbb740164f02ff9d8;p=openldap

diff --git a/libraries/libldap/extended.c b/libraries/libldap/extended.c
index 72657c3476..f42afd281a 100644
--- a/libraries/libldap/extended.c
+++ b/libraries/libldap/extended.c
@@ -1,5 +1,6 @@
+/* $OpenLDAP$ */
 /*
- * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -40,6 +41,7 @@ ldap_extended_operation(
 	int				*msgidp )
 {
 	BerElement *ber;
+	int rc;
 
 	Debug( LDAP_DEBUG_TRACE, "ldap_extended_operation\n", 0, 0, 0 );
 
@@ -49,10 +51,6 @@ ldap_extended_operation(
 	assert( msgidp != NULL );
 
 	/* must be version 3 (or greater) */
-	if ( ld->ld_version == 0 ) {
-		ld->ld_version = LDAP_VERSION3;
-	}
-
 	if ( ld->ld_version < LDAP_VERSION3 ) {
 		ld->ld_errno = LDAP_NOT_SUPPORTED;
 		return( ld->ld_errno );
@@ -64,15 +62,24 @@ ldap_extended_operation(
 	}
 
 	/* create a message to send */
-	if ( (ber = ldap_alloc_ber_with_options( ld )) == NULLBER ) {
+	if ( (ber = ldap_alloc_ber_with_options( ld )) == NULL ) {
 		ld->ld_errno = LDAP_NO_MEMORY;
 		return( ld->ld_errno );
 	}
 
-	if ( ber_printf( ber, "{it{tstO}", /* leave '}' for later */
-		++ld->ld_msgid, LDAP_REQ_EXTENDED, LDAP_TAG_EXOP_REQ_OID,
-			reqoid, LDAP_TAG_EXOP_REQ_VALUE, reqdata ) == -1 )
-	{
+	if ( reqdata != NULL ) {
+		rc = ber_printf( ber, "{it{tstO}", /* '}' */
+			++ld->ld_msgid, LDAP_REQ_EXTENDED,
+			LDAP_TAG_EXOP_REQ_OID, reqoid,
+			LDAP_TAG_EXOP_REQ_VALUE, reqdata );
+
+	} else {
+		rc = ber_printf( ber, "{it{ts}", /* '}' */
+			++ld->ld_msgid, LDAP_REQ_EXTENDED,
+			LDAP_TAG_EXOP_REQ_OID, reqoid );
+	}
+
+	if( rc == -1 ) {
 		ld->ld_errno = LDAP_ENCODING_ERROR;
 		ber_free( ber, 1 );
 		return( ld->ld_errno );
@@ -156,10 +163,11 @@ ldap_parse_extended_result (
 	int				freeit )
 {
 	BerElement *ber;
-	int rc;
-	unsigned long tag, len;
+	ber_tag_t rc;
+	ber_tag_t tag;
+	ber_len_t len;
 	struct berval *resdata;
-	long errcode;
+	ber_int_t errcode;
 	char *resoid;
 
 	assert( ld != NULL );
@@ -173,11 +181,14 @@ ldap_parse_extended_result (
 		return ld->ld_errno;
 	}
 
+	if( res->lm_msgtype != LDAP_RES_EXTENDED ) {
+		ld->ld_errno = LDAP_PARAM_ERROR;
+		return ld->ld_errno;
+	}
+
 	if( retoidp != NULL ) *retoidp = NULL;
 	if( retdatap != NULL ) *retdatap = NULL;
 
-	ber = ber_dup( res->lm_ber );
-
 	if ( ld->ld_error ) {
 		LDAP_FREE( ld->ld_error );
 		ld->ld_error = NULL;
@@ -188,8 +199,15 @@ ldap_parse_extended_result (
 		ld->ld_matched = NULL;
 	}
 
-	rc = ber_scanf( ber, "{iaa", &errcode,
-		&ld->ld_matched, &ld->ld_matched );
+	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;
@@ -202,6 +220,17 @@ ldap_parse_extended_result (
 
 	tag = ber_peek_tag( ber, &len );
 
+	if( tag == LDAP_TAG_REFERRAL ) {
+		/* skip over referral */
+		if( ber_scanf( ber, "x" ) == 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 ) {
 		/* we have a resoid */
 		if( ber_scanf( ber, "a", &resoid ) == LBER_ERROR ) {
@@ -215,7 +244,7 @@ ldap_parse_extended_result (
 
 	if( tag == LDAP_TAG_EXOP_RES_VALUE ) {
 		/* we have a resdata */
-		if( ber_scanf( ber, "O", &resoid ) == LBER_ERROR ) {
+		if( ber_scanf( ber, "O", &resdata ) == LBER_ERROR ) {
 			ld->ld_errno = LDAP_DECODING_ERROR;
 			ber_free( ber, 0 );
 			if( resoid != NULL ) LDAP_FREE( resoid );
@@ -223,6 +252,8 @@ ldap_parse_extended_result (
 		}
 	}
 
+	ber_free( ber, 0 );
+
 	if( retoidp != NULL ) {
 		*retoidp = resoid;
 	} else {