X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap%2Fextended.c;h=a8ca02b29ef469a8ebdb3df7387c5ee35520f735;hb=739466b85d6254ef84d83b7d4532dda518bd446d;hp=e92d4d25783b12cd8339298b29c5d0ded2a46265;hpb=669b8f4047c03d4583a44ed8287d0d5920d15373;p=openldap

diff --git a/libraries/libldap/extended.c b/libraries/libldap/extended.c
index e92d4d2578..a8ca02b29e 100644
--- a/libraries/libldap/extended.c
+++ b/libraries/libldap/extended.c
@@ -40,6 +40,7 @@ ldap_extended_operation(
 	int				*msgidp )
 {
 	BerElement *ber;
+	int rc;
 
 	Debug( LDAP_DEBUG_TRACE, "ldap_extended_operation\n", 0, 0, 0 );
 
@@ -65,10 +66,19 @@ ldap_extended_operation(
 		return( ld->ld_errno );
 	}
 
-	if ( ber_printf( ber, "{it{tstO}", /* '}' */
-		++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 );
@@ -170,6 +180,11 @@ 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;
 
@@ -199,6 +214,15 @@ ldap_parse_extended_result (
 
 	tag = ber_peek_tag( ber, &len );
 
+	if( tag == LDAP_TAG_REFERRAL ) {
+		/* skip over referral */
+		tag = ber_scanf( ber, "x" );
+
+		if( tag != LBER_ERROR ) {
+			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 ) {