Merge remote branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4

[openldap] / libraries / libldap / extended.c

diff --git a/libraries/libldap/extended.c b/libraries/libldap/extended.c
index 2aded658223947582168ae766936c913c1a973aa..8fb57701f50c5f538a464a7af655ad730709870b 100644 (file)
--- a/libraries/libldap/extended.c
+++ b/libraries/libldap/extended.c
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2005 The OpenLDAP Foundation.
+ * Copyright 1998-2012 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -12,9 +12,18 @@
  * top-level directory of the distribution or, alternatively, at
  * <http://www.OpenLDAP.org/license.html>.
  */
-/* Portions Copyright (C) The Internet Society (1997).
- * ASN.1 fragments are from RFC 2251; see RFC for full legal notices.
- */
+
+#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
@@ -30,20 +39,9 @@
  *             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,
@@ -61,7 +59,7 @@ ldap_extended_operation(
 
        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) */
@@ -131,8 +129,7 @@ ldap_extended_operation_s(
 
        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 );
@@ -141,7 +138,7 @@ ldap_extended_operation_s(
         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 );
        }
 
@@ -211,7 +208,7 @@ ldap_parse_extended_result (
                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 ) {
@@ -244,6 +241,8 @@ ldap_parse_extended_result (
                        return ld->ld_errno;
                }
 
+               assert( resoid[ 0 ] != '\0' );
+
                tag = ber_peek_tag( ber, &len );
        }
 
@@ -292,7 +291,6 @@ ldap_parse_intermediate (
        int                             freeit )
 {
        BerElement *ber;
-       ber_tag_t rc;
        ber_tag_t tag;
        ber_len_t len;
        struct berval *resdata;
@@ -316,6 +314,7 @@ ldap_parse_intermediate (
 
        if( retoidp != NULL ) *retoidp = NULL;
        if( retdatap != NULL ) *retdatap = NULL;
+       if( serverctrls != NULL ) *serverctrls = NULL;
 
        ber = ber_dup( res->lm_ber );
 
@@ -324,9 +323,9 @@ ldap_parse_intermediate (
                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;
@@ -351,6 +350,8 @@ ldap_parse_intermediate (
                        return ld->ld_errno;
                }
 
+               assert( resoid[ 0 ] != '\0' );
+
                tag = ber_peek_tag( ber, &len );
        }
 
@@ -365,16 +366,16 @@ ldap_parse_intermediate (
        }
 
        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_pvt_get_controls( ber, serverctrls );
+       ld->ld_errno = ldap_pvt_get_controls( ber, serverctrls );
 
 free_and_return:
        ber_free( ber, 0 );
@@ -395,6 +396,6 @@ free_and_return:
                ldap_msgfree( res );
        }
 
-       return LDAP_SUCCESS;
+       return ld->ld_errno;
 }