For ITS#2424, move all SASL session management to ldap_int_sasl_bind.

[openldap] / libraries / libldap / getattr.c

diff --git a/libraries/libldap/getattr.c b/libraries/libldap/getattr.c
index 07e8e27a4465e08b41b10e1cb0790ac21c7f0a45..6e67e71c681434bf499c012023e3d0288727252e 100644 (file)
--- a/libraries/libldap/getattr.c
+++ b/libraries/libldap/getattr.c
@@ -1,5 +1,6 @@
+/* $OpenLDAP$ */
 /*
- * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 /*  Portions
@@ -14,7 +15,6 @@
 #include <stdio.h>
 #include <ac/stdlib.h>
 
-#include <ac/ctype.h>
 #include <ac/socket.h>
 #include <ac/string.h>
 #include <ac/time.h>
@@ -22,60 +22,136 @@
 #include "ldap-int.h"
 
 char *
-ldap_first_attribute( LDAP *ld, LDAPMessage *entry, BerElement **ber )
+ldap_first_attribute( LDAP *ld, LDAPMessage *entry, BerElement **berout )
 {
+       int rc;
+       ber_tag_t tag;
+       ber_len_t len = 0;
        char *attr;
+       BerElement *ber;
 
+#ifdef NEW_LOGGING
+       LDAP_LOG ( OPERATION, ENTRY, "ldap_first_attribute\n", 0, 0, 0 );
+#else
        Debug( LDAP_DEBUG_TRACE, "ldap_first_attribute\n", 0, 0, 0 );
+#endif
 
        assert( ld != NULL );
        assert( LDAP_VALID( ld ) );
        assert( entry != NULL );
-       assert( ber != NULL );
+       assert( berout != NULL );
+
+       *berout = NULL;
 
-       if ( (*ber = ldap_alloc_ber_with_options( ld )) == NULL ) {
-               *ber = NULL;
-               return( NULL );
+       ber = ldap_alloc_ber_with_options( ld );
+       if( ber == NULL ) {
+               return NULL;
        }
 
-       **ber = *entry->lm_ber;
+       *ber = *entry->lm_ber;
 
        /* 
-        * Skip past the sequence, dn, sequence of sequence, snarf the
-        * attribute type, and skip the set of values, leaving us
-        * positioned right before the next attribute type/value sequence.
+        * Skip past the sequence, dn, sequence of sequence leaving
+        * us at the first attribute.
         */
 
-       if ( ber_scanf( *ber, "{x{{ax}", &attr )
-           == LBER_ERROR ) {
+       tag = ber_scanf( ber, "{xl{" /*}}*/, &len );
+       if( tag == LBER_ERROR ) {
                ld->ld_errno = LDAP_DECODING_ERROR;
-               ber_free( *ber, 0 );
-               *ber = NULL;
-               return( NULL );
+               ber_free( ber, 0 );
+               return NULL;
+       }
+
+       /* set the length to avoid overrun */
+       rc = ber_set_option( ber, LBER_OPT_REMAINING_BYTES, &len );
+       if( rc != LBER_OPT_SUCCESS ) {
+               ld->ld_errno = LDAP_LOCAL_ERROR;
+               ber_free( ber, 0 );
+               return NULL;
        }
 
-       return( attr );
+       if ( ber_pvt_ber_remaining( ber ) == 0 ) {
+               assert( len == 0 );
+               ber_free( ber, 0 );
+               return NULL;
+       }
+       assert( len != 0 );
+
+       /* snatch the first attribute */
+       tag = ber_scanf( ber, "{ax}", &attr );
+       if( tag == LBER_ERROR ) {
+               ld->ld_errno = LDAP_DECODING_ERROR;
+               ber_free( ber, 0 );
+               return NULL;
+       }
+
+       *berout = ber;
+       return attr;
 }
 
 /* ARGSUSED */
 char *
 ldap_next_attribute( LDAP *ld, LDAPMessage *entry, BerElement *ber )
 {
+       ber_tag_t tag;
        char *attr;
 
+#ifdef NEW_LOGGING
+       LDAP_LOG ( OPERATION, ENTRY, "ldap_next_attribute\n", 0, 0, 0 );
+#else
        Debug( LDAP_DEBUG_TRACE, "ldap_next_attribute\n", 0, 0, 0 );
+#endif
 
        assert( ld != NULL );
        assert( LDAP_VALID( ld ) );
        assert( entry != NULL );
        assert( ber != NULL );
 
+       if ( ber_pvt_ber_remaining( ber ) == 0 ) {
+               return NULL;
+       }
+
        /* skip sequence, snarf attribute type, skip values */
-       if ( ber_scanf( ber, "{ax}", &attr ) 
-           == LBER_ERROR ) {
+       tag = ber_scanf( ber, "{ax}", &attr ); 
+       if( tag == LBER_ERROR ) {
                ld->ld_errno = LDAP_DECODING_ERROR;
-               return( NULL );
+               return NULL;
+       }
+
+       return attr;
+}
+
+/* Fetch attribute type and optionally fetch values */
+/* ARGSUSED */
+int
+ldap_get_attribute_ber( LDAP *ld, LDAPMessage *entry, BerElement *ber,
+       BerValue *attr, BerVarray *vals )
+{
+       ber_tag_t tag;
+       int rc = LDAP_SUCCESS;
+
+#ifdef NEW_LOGGING
+       LDAP_LOG ( OPERATION, ENTRY, "ldap_get_attribute_ber\n", 0, 0, 0 );
+#else
+       Debug( LDAP_DEBUG_TRACE, "ldap_get_attribute_ber\n", 0, 0, 0 );
+#endif
+
+       assert( ld != NULL );
+       assert( LDAP_VALID( ld ) );
+       assert( entry != NULL );
+       assert( ber != NULL );
+       assert( attr != NULL );
+
+       attr->bv_val = NULL;
+       attr->bv_len = 0;
+
+       if ( ber_pvt_ber_remaining( ber ) ) {
+               /* skip sequence, snarf attribute type */
+               tag = ber_scanf( ber, vals ? "{mW}" : "{mx}", attr, vals ); 
+               if( tag == LBER_ERROR ) {
+                       rc = ld->ld_errno = LDAP_DECODING_ERROR;
+               }
        }
 
-       return( attr );
+       return rc;
 }