X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap%2Fgetentry.c;h=4fb23eff6cb69bc0993f0daec9c65963daf39231;hb=70092b38fb23b9141a2b8414fb5a9c5200f3c12d;hp=069b2dcbe97f2df759e56623dc3ed5ebb36e806b;hpb=138d76ecf458ca1d1fd6ca0e24183d86a8b71e92;p=openldap

diff --git a/libraries/libldap/getentry.c b/libraries/libldap/getentry.c
index 069b2dcbe9..4fb23eff6c 100644
--- a/libraries/libldap/getentry.c
+++ b/libraries/libldap/getentry.c
@@ -1,4 +1,9 @@
+/* $OpenLDAP$ */
 /*
+ * Copyright 1998-2002 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.
  *
@@ -7,14 +12,9 @@
 
 #include "portable.h"
 
-#ifndef lint 
-static char copyright[] = "@(#) Copyright (c) 1990 Regents of the University of Michigan.\nAll rights reserved.\n";
-#endif
-
 #include <stdio.h>
-#include <stdlib.h>
+#include <ac/stdlib.h>
 
-#include <ac/ctype.h>
 #include <ac/socket.h>
 #include <ac/string.h>
 #include <ac/time.h>
@@ -25,26 +25,25 @@ static char copyright[] = "@(#) Copyright (c) 1990 Regents of the University of
 LDAPMessage *
 ldap_first_entry( LDAP *ld, LDAPMessage *chain )
 {
-	if( ld == NULL || chain == NULLMSG ) {
-		return NULLMSG;
-	}
+	assert( ld != NULL );
+	assert( LDAP_VALID( ld ) );
+	assert( chain != NULL );
 
 	return chain->lm_msgtype == LDAP_RES_SEARCH_ENTRY
 		? chain
 		: ldap_next_entry( ld, chain );
 }
 
-/* ARGSUSED */
 LDAPMessage *
 ldap_next_entry( LDAP *ld, LDAPMessage *entry )
 {
-	if ( ld == NULL || entry == NULLMSG ) {
-		return NULLMSG;
-	}
+	assert( ld != NULL );
+	assert( LDAP_VALID( ld ) );
+	assert( entry != NULL );
 
-	for (
+	for(
 		entry = entry->lm_chain;
-		entry != NULLMSG;
+		entry != NULL;
 		entry = entry->lm_chain )
 	{
 		if( entry->lm_msgtype == LDAP_RES_SEARCH_ENTRY ) {
@@ -52,18 +51,16 @@ ldap_next_entry( LDAP *ld, LDAPMessage *entry )
 		}
 	}
 
-	return( NULLMSG );
+	return( NULL );
 }
 
-/* ARGSUSED */
 int
 ldap_count_entries( LDAP *ld, LDAPMessage *chain )
 {
 	int	i;
 
-	if ( ld == NULL ) {
-		return -1;
-	}
+	assert( ld != NULL );
+	assert( LDAP_VALID( ld ) );
 
 	for ( i = 0; chain != NULL; chain = chain->lm_chain ) {
 		if( chain->lm_msgtype == LDAP_RES_SEARCH_ENTRY ) {
@@ -73,3 +70,49 @@ ldap_count_entries( LDAP *ld, LDAPMessage *chain )
 
 	return( i );
 }
+
+int
+ldap_get_entry_controls(
+	LDAP *ld,
+	LDAPMessage *entry, 
+	LDAPControl ***sctrls )
+{
+	int rc;
+	BerElement be;
+
+	assert( ld != NULL );
+	assert( LDAP_VALID( ld ) );
+	assert( entry != NULL );
+	assert( sctrls != NULL );
+
+	if ( entry->lm_msgtype != LDAP_RES_SEARCH_ENTRY ) {
+		return LDAP_PARAM_ERROR;
+	}
+
+	/* make a local copy of the BerElement */
+	AC_MEMCPY(&be, entry->lm_ber, sizeof(be));
+
+	if ( ber_scanf( &be, "{xx" /*}*/ ) == LBER_ERROR ) {
+		rc = LDAP_DECODING_ERROR;
+		goto cleanup_and_return;
+	}
+
+	rc = ldap_int_get_controls( &be, sctrls );
+
+cleanup_and_return:
+	if( rc != LDAP_SUCCESS ) {
+		ld->ld_errno = rc;
+
+		if( ld->ld_matched != NULL ) {
+			LDAP_FREE( ld->ld_matched );
+			ld->ld_matched = NULL;
+		}
+
+		if( ld->ld_error != NULL ) {
+			LDAP_FREE( ld->ld_error );
+			ld->ld_error = NULL;
+		}
+	}
+
+	return rc;
+}