X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=libraries%2Flibldap%2Fgetattr.c;h=41ce3e86b15b2b662f05f577fb1d180858d420ed;hb=544d00f3e53f598e51d23c795f72e5ba3a2f8642;hp=272dbce04ff0641ab65267871d8b02385086a413;hpb=b611ec4b87aa0858ba99fd114d99cff5054c52a3;p=openldap

diff --git a/libraries/libldap/getattr.c b/libraries/libldap/getattr.c
index 272dbce04f..41ce3e86b1 100644
--- 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-2006 The OpenLDAP Foundation.
+ * All rights reserved.
  *
- *  getattr.c
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * 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"
@@ -24,8 +30,9 @@
 char *
 ldap_first_attribute( LDAP *ld, LDAPMessage *entry, BerElement **berout )
 {
-	ber_tag_t rc;
-	ber_len_t len;
+	int rc;
+	ber_tag_t tag;
+	ber_len_t len = 0;
 	char *attr;
 	BerElement *ber;
 
@@ -36,6 +43,8 @@ ldap_first_attribute( LDAP *ld, LDAPMessage *entry, BerElement **berout )
 	assert( entry != NULL );
 	assert( berout != NULL );
 
+	*berout = NULL;
+
 	ber = ldap_alloc_ber_with_options( ld );
 	if( ber == NULL ) {
 		return NULL;
@@ -48,32 +57,31 @@ ldap_first_attribute( LDAP *ld, LDAPMessage *entry, BerElement **berout )
 	 * us at the first attribute.
 	 */
 
-	rc = ber_scanf( ber, "{xl{" /*}}*/, &attr, &len );
-
-	if( rc == LBER_ERROR ) {
+	tag = ber_scanf( ber, "{xl{" /*}}*/, &len );
+	if( tag == LBER_ERROR ) {
 		ld->ld_errno = LDAP_DECODING_ERROR;
 		ber_free( ber, 0 );
-		return  NULL;
-	}
-
-#if 0
-	if( len == 0 ) {
 		return NULL;
 	}
-#endif
-	
+
 	/* 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;
 	}
 
+	if ( ber_pvt_ber_remaining( ber ) == 0 ) {
+		assert( len == 0 );
+		ber_free( ber, 0 );
+		return NULL;
+	}
+	assert( len != 0 );
+
 	/* snatch the first attribute */
-	rc = ber_scanf( ber, "{ax}", &attr );
-	if( rc == LBER_ERROR ) {
+	tag = ber_scanf( ber, "{ax}", &attr );
+	if( tag == LBER_ERROR ) {
 		ld->ld_errno = LDAP_DECODING_ERROR;
 		ber_free( ber, 0 );
 		return NULL;
@@ -87,7 +95,7 @@ ldap_first_attribute( LDAP *ld, LDAPMessage *entry, BerElement **berout )
 char *
 ldap_next_attribute( LDAP *ld, LDAPMessage *entry, BerElement *ber )
 {
-	ber_tag_t rc;
+	ber_tag_t tag;
 	char *attr;
 
 	Debug( LDAP_DEBUG_TRACE, "ldap_next_attribute\n", 0, 0, 0 );
@@ -97,18 +105,53 @@ ldap_next_attribute( LDAP *ld, LDAPMessage *entry, BerElement *ber )
 	assert( entry != NULL );
 	assert( ber != NULL );
 
-#if 0
 	if ( ber_pvt_ber_remaining( ber ) == 0 ) {
 		return NULL;
 	}
-#endif
 
 	/* skip sequence, snarf attribute type, skip values */
-	rc = ber_scanf( ber, "{ax}", &attr ); 
-	if( rc == LBER_ERROR ) {
+	tag = ber_scanf( ber, "{ax}", &attr ); 
+	if( tag == LBER_ERROR ) {
 		ld->ld_errno = LDAP_DECODING_ERROR;
 		return NULL;
 	}
 
 	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;
+
+	Debug( LDAP_DEBUG_TRACE, "ldap_get_attribute_ber\n", 0, 0, 0 );
+
+	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;
+}