Sync with HEAD

[openldap] / libraries / libldap / getattr.c

diff --git a/libraries/libldap/getattr.c b/libraries/libldap/getattr.c
index ae645534fb724943df2e043d516abe62f9c50a2b..a5b77c7b3130c7f8776c28da96aa5c2764086a22 100644 (file)
--- a/libraries/libldap/getattr.c
+++ b/libraries/libldap/getattr.c
@@ -1,13 +1,19 @@
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
- */
-/*  Portions
- *  Copyright (c) 1990 Regents of the University of Michigan.
- *  All rights reserved.
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2003 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
  *
- *  getattr.c
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
+ */
+/* Portions Copyright (c) 1990 Regents of the University of Michigan.
+ * All rights reserved.
  */
 
 #include "portable.h"
@@ -26,11 +32,15 @@ ldap_first_attribute( LDAP *ld, LDAPMessage *entry, BerElement **berout )
 {
        int rc;
        ber_tag_t tag;
-       ber_len_t len;
+       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 ) );
@@ -51,20 +61,13 @@ ldap_first_attribute( LDAP *ld, LDAPMessage *entry, BerElement **berout )
         * us at the first attribute.
         */
 
-       tag = ber_scanf( ber, "{xl{" /*}}*/, &attr, &len );
+       tag = ber_scanf( ber, "{xl{" /*}}*/, &len );
        if( tag == LBER_ERROR ) {
                ld->ld_errno = LDAP_DECODING_ERROR;
                ber_free( ber, 0 );
-               return  NULL;
-       }
-
-#if LDAP_SEQORSET_BAILOUT
-       if( len == 0 ) {
                return NULL;
        }
-#endif
-       
-#if LBER_SEQORSET_AVOID_OVERRUN
+
        /* set the length to avoid overrun */
        rc = ber_set_option( ber, LBER_OPT_REMAINING_BYTES, &len );
        if( rc != LBER_OPT_SUCCESS ) {
@@ -72,7 +75,13 @@ ldap_first_attribute( LDAP *ld, LDAPMessage *entry, BerElement **berout )
                ber_free( ber, 0 );
                return NULL;
        }
-#endif
+
+       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 );
@@ -93,18 +102,20 @@ 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 LDAP_SEQORSET_BAILOUT
        if ( ber_pvt_ber_remaining( ber ) == 0 ) {
                return NULL;
        }
-#endif
 
        /* skip sequence, snarf attribute type, skip values */
        tag = ber_scanf( ber, "{ax}", &attr ); 
@@ -115,3 +126,44 @@ ldap_next_attribute( LDAP *ld, LDAPMessage *entry, BerElement *ber )
 
        return attr;
 }
+
+/* Fetch attribute type and optionally fetch values. The type
+ * and values are referenced in-place from the BerElement, they are
+ * not dup'd into malloc'd memory.
+ */
+/* 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 ) ) {
+               ber_len_t siz = sizeof( BerValue );
+
+               /* skip sequence, snarf attribute type */
+               tag = ber_scanf( ber, vals ? "{mM}" : "{mx}", attr, vals,
+                       &siz, 0 ); 
+               if( tag == LBER_ERROR ) {
+                       rc = ld->ld_errno = LDAP_DECODING_ERROR;
+               }
+       }
+
+       return rc;
+}