X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=libraries%2Flibldap%2Fgetattr.c;h=41ce3e86b15b2b662f05f577fb1d180858d420ed;hb=544d00f3e53f598e51d23c795f72e5ba3a2f8642;hp=5a6d77066e1ea066de1ad81779743960f18763a2;hpb=21c70857f1029309d6bc5a5b6a93d7537494b742;p=openldap
diff --git a/libraries/libldap/getattr.c b/libraries/libldap/getattr.c
index 5a6d77066e..41ce3e86b1 100644
--- a/libraries/libldap/getattr.c
+++ b/libraries/libldap/getattr.c
@@ -1,12 +1,19 @@
-/*
- * Copyright 1998-1999 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.
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software .
+ *
+ * Copyright 1998-2006 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
+ * .
+ */
+/* Portions Copyright (c) 1990 Regents of the University of Michigan.
+ * All rights reserved.
*/
#include "portable.h"
@@ -14,7 +21,6 @@
#include
#include
-#include
#include
#include
#include
@@ -22,58 +28,130 @@
#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;
+
+ Debug( LDAP_DEBUG_TRACE, "ldap_first_attribute\n", 0, 0, 0 );
assert( ld != NULL );
+ assert( LDAP_VALID( ld ) );
assert( entry != NULL );
- assert( ber != NULL );
+ assert( berout != NULL );
- Debug( LDAP_DEBUG_TRACE, "ldap_first_attribute\n", 0, 0, 0 );
+ *berout = NULL;
- if ( (*ber = ldap_alloc_ber_with_options( ld )) == NULLBER ) {
- *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;
}
- return( attr );
+ /* 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 */
+ 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;
+ Debug( LDAP_DEBUG_TRACE, "ldap_next_attribute\n", 0, 0, 0 );
+
assert( ld != NULL );
+ assert( LDAP_VALID( ld ) );
assert( entry != NULL );
assert( ber != NULL );
- Debug( LDAP_DEBUG_TRACE, "ldap_next_attribute\n", 0, 0, 0 );
+ 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. 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( attr );
+ return rc;
}