NT ldap_pvt_thread_self fix from HEAD

[openldap] / libraries / libldap / getentry.c

diff --git a/libraries/libldap/getentry.c b/libraries/libldap/getentry.c
index df25d7a3ab215e8682d7acd95a1772816ada239f..87421849c9912848855d4d386a63116f71e2427e 100644 (file)
--- a/libraries/libldap/getentry.c
+++ b/libraries/libldap/getentry.c
@@ -1,54 +1,124 @@
-/*
- *  Copyright (c) 1990 Regents of the University of Michigan.
- *  All rights reserved.
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- *  getentry.c
+ * Copyright 1998-2004 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.
+ *
+ * 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"
 
-#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 <ctype.h>
+#include <ac/stdlib.h>
 
 #include <ac/socket.h>
 #include <ac/string.h>
 #include <ac/time.h>
 
-#include "lber.h"
-#include "ldap.h"
+#include "ldap-int.h"
 
 /* ARGSUSED */
 LDAPMessage *
 ldap_first_entry( LDAP *ld, LDAPMessage *chain )
 {
-       return( chain == NULLMSG || chain->lm_msgtype == LDAP_RES_SEARCH_RESULT
-           ? NULLMSG : chain );
+       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 )
+LDAPMessage *
+ldap_next_entry( LDAP *ld, LDAPMessage *entry )
 {
-       if ( entry == NULLMSG || entry->lm_chain == NULLMSG
-           || entry->lm_chain->lm_msgtype == LDAP_RES_SEARCH_RESULT )
-               return( NULLMSG );
+       assert( ld != NULL );
+       assert( LDAP_VALID( ld ) );
+       assert( entry != NULL );
+
+       for(
+               entry = entry->lm_chain;
+               entry != NULL;
+               entry = entry->lm_chain )
+       {
+               if( entry->lm_msgtype == LDAP_RES_SEARCH_ENTRY ) {
+                       return( entry );
+               }
+       }
 
-       return( entry->lm_chain );
+       return( NULL );
 }
 
-/* ARGSUSED */
 int
 ldap_count_entries( LDAP *ld, LDAPMessage *chain )
 {
        int     i;
 
-       for ( i = 0; chain != NULL && chain->lm_msgtype
-           != LDAP_RES_SEARCH_RESULT; chain = chain->lm_chain )
-               i++;
+       assert( ld != NULL );
+       assert( LDAP_VALID( ld ) );
+
+       for ( i = 0; chain != NULL; chain = chain->lm_chain ) {
+               if( chain->lm_msgtype == LDAP_RES_SEARCH_ENTRY ) {
+                       i++;
+               }
+       }
 
        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_pvt_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;
+}