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 4dbe3c3fb9e826e8e6f4aae00ebcf93e30a99339..6e67e71c681434bf499c012023e3d0288727252e 100644 (file)
--- a/libraries/libldap/getattr.c
+++ b/libraries/libldap/getattr.c
@@ -1,6 +1,6 @@
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 /*  Portions
@@ -30,7 +30,11 @@ ldap_first_attribute( LDAP *ld, LDAPMessage *entry, BerElement **berout )
        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 ) );
@@ -92,7 +96,11 @@ 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 ) );
@@ -112,3 +120,38 @@ ldap_next_attribute( LDAP *ld, LDAPMessage *entry, BerElement *ber )
 
        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 rc;
+}