-/*
- * 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 <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2011 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.
*
- * getentry.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"
#include <stdio.h>
#include <ac/stdlib.h>
-#include <ac/ctype.h>
#include <ac/socket.h>
#include <ac/string.h>
#include <ac/time.h>
{
assert( ld != NULL );
assert( LDAP_VALID( ld ) );
-
- if( ld == NULL || chain == NULLMSG ) {
- return NULLMSG;
- }
+ assert( chain != NULL );
return chain->lm_msgtype == LDAP_RES_SEARCH_ENTRY
? chain
{
assert( ld != NULL );
assert( LDAP_VALID( ld ) );
+ assert( entry != NULL );
- if ( ld == NULL || entry == NULLMSG ) {
- return NULLMSG;
- }
-
- for (
+ for(
entry = entry->lm_chain;
- entry != NULLMSG;
+ entry != NULL;
entry = entry->lm_chain )
{
if( entry->lm_msgtype == LDAP_RES_SEARCH_ENTRY ) {
}
}
- return( NULLMSG );
+ return( NULL );
}
int
assert( ld != NULL );
assert( LDAP_VALID( ld ) );
- if ( ld == NULL ) {
- return -1;
- }
-
for ( i = 0; chain != NULL; chain = chain->lm_chain ) {
if( chain->lm_msgtype == LDAP_RES_SEARCH_ENTRY ) {
i++;
assert( entry != NULL );
assert( sctrls != NULL );
- if ( ld == NULL || sctrls == NULL ||
- entry == NULL || entry->lm_msgtype == LDAP_RES_SEARCH_ENTRY )
- {
+ if ( entry->lm_msgtype != LDAP_RES_SEARCH_ENTRY ) {
return LDAP_PARAM_ERROR;
}
/* make a local copy of the BerElement */
- SAFEMEMCPY(&be, entry->lm_ber, sizeof(be));
+ 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 );
+ rc = ldap_pvt_get_controls( &be, sctrls );
cleanup_and_return:
if( rc != LDAP_SUCCESS ) {