Sync with HEAD

[openldap] / libraries / libldap / extended.c

diff --git a/libraries/libldap/extended.c b/libraries/libldap/extended.c
index c9c27be37d2a1542975ef86269bce669924599e1..a15365d05350c3a17e2a3bd58020a90c6e5c7189 100644 (file)
--- a/libraries/libldap/extended.c
+++ b/libraries/libldap/extended.c
@@ -3,6 +3,10 @@
  * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
+/*
+ * Portions Copyright (C) The Internet Society (1997)
+ * ASN.1 fragments are from RFC 2251; see RFC for full legal notices.
+ */
 
 /*
  * LDAPv3 Extended Operation Request
@@ -43,6 +47,7 @@ ldap_extended_operation(
 {
        BerElement *ber;
        int rc;
+       ber_int_t id;
 
 #ifdef NEW_LOGGING
        LDAP_LOG ( OPERATION, ENTRY, "ldap_extended_operation\n", 0,0,0 );
@@ -67,15 +72,16 @@ ldap_extended_operation(
                return( ld->ld_errno );
        }
 
+       LDAP_NEXT_MSGID( ld, id );
        if ( reqdata != NULL ) {
                rc = ber_printf( ber, "{it{tstON}", /* '}' */
-                       ++ld->ld_msgid, LDAP_REQ_EXTENDED,
+                       id, LDAP_REQ_EXTENDED,
                        LDAP_TAG_EXOP_REQ_OID, reqoid,
                        LDAP_TAG_EXOP_REQ_VALUE, reqdata );
 
        } else {
                rc = ber_printf( ber, "{it{tsN}", /* '}' */
-                       ++ld->ld_msgid, LDAP_REQ_EXTENDED,
+                       id, LDAP_REQ_EXTENDED,
                        LDAP_TAG_EXOP_REQ_OID, reqoid );
        }
 
@@ -98,7 +104,7 @@ ldap_extended_operation(
        }
 
        /* send the message */
-       *msgidp = ldap_send_initial_request( ld, LDAP_REQ_EXTENDED, NULL, ber );
+       *msgidp = ldap_send_initial_request( ld, LDAP_REQ_EXTENDED, NULL, ber, id );
 
        return( *msgidp < 0 ? ld->ld_errno : LDAP_SUCCESS );
 }
@@ -281,7 +287,7 @@ ldap_parse_extended_result (
 
 /* Parse an extended partial */
 int
-ldap_parse_extended_partial (
+ldap_parse_intermediate (
        LDAP                    *ld,
        LDAPMessage             *res,
        char                    **retoidp,
@@ -301,9 +307,9 @@ ldap_parse_extended_partial (
        assert( res != NULL );
 
 #ifdef NEW_LOGGING
-       LDAP_LOG ( OPERATION, ENTRY, "ldap_parse_extended_partial\n", 0,0,0 );
+       LDAP_LOG ( OPERATION, ENTRY, "ldap_parse_intermediate\n", 0,0,0 );
 #else
-       Debug( LDAP_DEBUG_TRACE, "ldap_parse_extended_partial\n", 0, 0, 0 );
+       Debug( LDAP_DEBUG_TRACE, "ldap_parse_intermediate\n", 0, 0, 0 );
 #endif
 
        if( ld->ld_version < LDAP_VERSION3 ) {
@@ -311,7 +317,7 @@ ldap_parse_extended_partial (
                return ld->ld_errno;
        }
 
-       if( res->lm_msgtype != LDAP_RES_EXTENDED_PARTIAL ) {
+       if( res->lm_msgtype != LDAP_RES_INTERMEDIATE ) {
                ld->ld_errno = LDAP_PARAM_ERROR;
                return ld->ld_errno;
        }
@@ -370,7 +376,7 @@ ldap_parse_extended_partial (
                goto free_and_return;
        }
 
-       rc = ldap_int_get_controls( ber, serverctrls );
+       rc = ldap_pvt_get_controls( ber, serverctrls );
 
 free_and_return:
        ber_free( ber, 0 );
@@ -394,119 +400,3 @@ free_and_return:
        return LDAP_SUCCESS;
 }
 
-#ifdef LDAP_RES_INTERMEDIATE_RESP
-/* 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