X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap%2Freferences.c;h=5267ce5ae8580b5c65c8139e73c40ccec74ffec0;hb=2dfd312fa12a765a5ad311f6c9bf8dce76a63155;hp=bd2b79c12f6aba5680cca4c8eeb931074cdec403;hpb=1bcec8bf6a17a65396b2c947faed846d20428db9;p=openldap
diff --git a/libraries/libldap/references.c b/libraries/libldap/references.c
index bd2b79c12f..5267ce5ae8 100644
--- a/libraries/libldap/references.c
+++ b/libraries/libldap/references.c
@@ -1,33 +1,37 @@
-/*
- * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
- */
-/*
- * references.c
+/* references.c */
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software .
+ *
+ * Copyright 1998-2005 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
+ * .
*/
#include "portable.h"
#include
-#include
-#include
+#include
+
#include
#include
#include
#include "ldap-int.h"
-/* ARGSUSED */
LDAPMessage *
ldap_first_reference( LDAP *ld, LDAPMessage *chain )
{
assert( ld != NULL );
- assert( chain != NULL );
-
- if ( ld == NULL || chain == NULLMSG ) {
- return NULLMSG;
- }
+ assert( LDAP_VALID( ld ) );
+ assert( chain != NULL );
return chain->lm_msgtype == LDAP_RES_SEARCH_REFERENCE
? chain
@@ -38,15 +42,12 @@ LDAPMessage *
ldap_next_reference( LDAP *ld, LDAPMessage *ref )
{
assert( ld != NULL );
- assert( ref != NULL );
-
- if ( ld == NULL || ref == NULLMSG ) {
- return NULLMSG;
- }
+ assert( LDAP_VALID( ld ) );
+ assert( ref != NULL );
for (
ref = ref->lm_chain;
- ref != NULLMSG;
+ ref != NULL;
ref = ref->lm_chain )
{
if( ref->lm_msgtype == LDAP_RES_SEARCH_REFERENCE ) {
@@ -54,7 +55,7 @@ ldap_next_reference( LDAP *ld, LDAPMessage *ref )
}
}
- return( NULLMSG );
+ return( NULL );
}
int
@@ -63,11 +64,7 @@ ldap_count_references( LDAP *ld, LDAPMessage *chain )
int i;
assert( ld != NULL );
- assert( chain != NULL );
-
- if ( ld == NULL ) {
- return -1;
- }
+ assert( LDAP_VALID( ld ) );
for ( i = 0; chain != NULL; chain = chain->lm_chain ) {
if( chain->lm_msgtype == LDAP_RES_SEARCH_REFERENCE ) {
@@ -91,16 +88,15 @@ ldap_parse_reference(
int rc;
assert( ld != NULL );
+ 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;
@@ -117,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:
@@ -126,7 +122,7 @@ free_and_return:
*referralsp = refs;
} else {
- ldap_value_free( refs );
+ LDAP_VFREE( refs );
}
if( freeit ) {