X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap%2Freferences.c;h=17c88b0c0e2555f1a61bc2ee45747f43405e0bbc;hb=e22dc83ac096d1239a6903199f5dc3231b0f444b;hp=c42f652057cc9ce4ceb773ac92964bcf19df2c95;hpb=6ad1c45bd3a69a398b144b92fbcf9d6653f02607;p=openldap

diff --git a/libraries/libldap/references.c b/libraries/libldap/references.c
index c42f652057..17c88b0c0e 100644
--- a/libraries/libldap/references.c
+++ b/libraries/libldap/references.c
@@ -1,10 +1,17 @@
+/* references.c */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
- */
-/*
- *  references.c
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2009 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>.
  */
 
 #include "portable.h"
@@ -13,7 +20,6 @@
 
 #include <ac/stdlib.h>
 
-#include <ac/ctype.h>
 #include <ac/socket.h>
 #include <ac/string.h>
 #include <ac/time.h>
@@ -25,11 +31,7 @@ ldap_first_reference( LDAP *ld, LDAPMessage *chain )
 {
 	assert( ld != NULL );
 	assert( LDAP_VALID( ld ) );
-	assert( chain !=  NULL );
-
-	if ( ld == NULL || chain == NULL ) {
-		return NULL;
-	}
+	assert( chain != NULL );
 
 	return chain->lm_msgtype == LDAP_RES_SEARCH_REFERENCE
 		? chain
@@ -41,11 +43,7 @@ ldap_next_reference( LDAP *ld, LDAPMessage *ref )
 {
 	assert( ld != NULL );
 	assert( LDAP_VALID( ld ) );
-	assert( ref !=  NULL );
-
-	if ( ld == NULL || ref == NULL ) {
-		return NULL;
-	}
+	assert( ref != NULL );
 
 	for (
 		ref = ref->lm_chain;
@@ -67,13 +65,7 @@ ldap_count_references( LDAP *ld, LDAPMessage *chain )
 
 	assert( ld != NULL );
 	assert( LDAP_VALID( ld ) );
-	assert( chain !=  NULL );
-
-	if ( ld == NULL ) {
-		return -1;
-	}
 
-	
 	for ( i = 0; chain != NULL; chain = chain->lm_chain ) {
 		if( chain->lm_msgtype == LDAP_RES_SEARCH_REFERENCE ) {
 			i++;
@@ -99,14 +91,12 @@ ldap_parse_reference(
 	assert( LDAP_VALID( ld ) );
 	assert( ref !=  NULL );
 
-	if( ld == NULL || ref == NULL ||
-		ref->lm_msgtype != LDAP_RES_SEARCH_REFERENCE )
-	{
+	if( ref->lm_msgtype != LDAP_RES_SEARCH_REFERENCE ) {
 		return LDAP_PARAM_ERROR;
 	}
 
 	/* make a private copy of BerElement */
-	SAFEMEMCPY(&be, ref->lm_ber, sizeof(be));
+	AC_MEMCPY(&be, ref->lm_ber, sizeof(be));
 	
 	if ( ber_scanf( &be, "{v" /*}*/, &refs ) == LBER_ERROR ) {
 		rc = LDAP_DECODING_ERROR;
@@ -123,7 +113,7 @@ ldap_parse_reference(
 		goto free_and_return;
 	}
 
-	rc = ldap_int_get_controls( &be, serverctrls );
+	rc = ldap_pvt_get_controls( &be, serverctrls );
 
 free_and_return: