cleanup last commit, add commit

[openldap] / libraries / libldap / references.c

diff --git a/libraries/libldap/references.c b/libraries/libldap/references.c
index 2aae3f469c5a0bcce38000b0685e601c19cb4a6f..84b6d69716178a568709b65d796d088fa4df9789 100644 (file)
--- a/libraries/libldap/references.c
+++ b/libraries/libldap/references.c
@@ -1,10 +1,17 @@
+/* references.c */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2002 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-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>.
  */
 
 #include "portable.h"
@@ -24,7 +31,7 @@ ldap_first_reference( LDAP *ld, LDAPMessage *chain )
 {
        assert( ld != NULL );
        assert( LDAP_VALID( ld ) );
-       assert( chain !=  NULL );
+       assert( chain != NULL );
 
        return chain->lm_msgtype == LDAP_RES_SEARCH_REFERENCE
                ? chain
@@ -36,7 +43,7 @@ ldap_next_reference( LDAP *ld, LDAPMessage *ref )
 {
        assert( ld != NULL );
        assert( LDAP_VALID( ld ) );
-       assert( ref !=  NULL );
+       assert( ref != NULL );
 
        for (
                ref = ref->lm_chain;
@@ -58,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++;
@@ -112,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: