Happy new year (belated)

[openldap] / libraries / libldap / references.c

diff --git a/libraries/libldap/references.c b/libraries/libldap/references.c
index 569e209518a961306ef1cb375f3f3f1a96b06e72..6e6b98f47aaa3c7ca16571a2d4898fa95c9797d1 100644 (file)
--- a/libraries/libldap/references.c
+++ b/libraries/libldap/references.c
@@ -1,58 +1,70 @@
-/*
- *  references.c
+/* references.c */
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2014 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"
 
 #include <stdio.h>
-#include <stdlib.h>
 
-#include <ac/ctype.h>
+#include <ac/stdlib.h>
+
 #include <ac/socket.h>
 #include <ac/string.h>
 #include <ac/time.h>
 
 #include "ldap-int.h"
 
-/* ARGSUSED */
 LDAPMessage *
 ldap_first_reference( LDAP *ld, LDAPMessage *chain )
 {
-       if ( ld == NULL || chain == NULLMSG ) {
-               return NULLMSG;
-       }
+       assert( ld != NULL );
+       assert( LDAP_VALID( ld ) );
+       assert( chain != NULL );
 
        return chain->lm_msgtype == LDAP_RES_SEARCH_REFERENCE
                ? chain
                : ldap_next_reference( ld, chain );
 }
 
-/* ARGSUSED */
 LDAPMessage *
 ldap_next_reference( LDAP *ld, LDAPMessage *ref )
 {
-       if ( ld == NULL || ref == NULLMSG ) {
-               return NULLMSG;
-       }
+       assert( ld != NULL );
+       assert( LDAP_VALID( ld ) );
+       assert( ref != NULL );
 
-       for ( ; ref != NULLMSG; ref = ref->lm_chain ) {
+       for (
+               ref = ref->lm_chain;
+               ref != NULL;
+               ref = ref->lm_chain )
+       {
                if( ref->lm_msgtype == LDAP_RES_SEARCH_REFERENCE ) {
                        return( ref );
                }
        }
 
-       return( NULLMSG );
+       return( NULL );
 }
 
-/* ARGSUSED */
 int
 ldap_count_references( LDAP *ld, LDAPMessage *chain )
 {
        int     i;
 
-       if ( ld == NULL ) {
-               return -1;
-       }
+       assert( ld != NULL );
+       assert( LDAP_VALID( ld ) );
 
        for ( i = 0; chain != NULL; chain = chain->lm_chain ) {
                if( chain->lm_msgtype == LDAP_RES_SEARCH_REFERENCE ) {
@@ -62,3 +74,74 @@ ldap_count_references( LDAP *ld, LDAPMessage *chain )
 
        return( i );
 }
+
+int
+ldap_parse_reference( 
+       LDAP            *ld,    
+       LDAPMessage     *ref,
+       char            ***referralsp,
+       LDAPControl     ***serverctrls,
+       int             freeit)
+{
+       BerElement be;
+       char **refs = NULL;
+       int rc;
+
+       assert( ld != NULL );
+       assert( LDAP_VALID( ld ) );
+       assert( ref !=  NULL );
+
+       if( ref->lm_msgtype != LDAP_RES_SEARCH_REFERENCE ) {
+               return LDAP_PARAM_ERROR;
+       }
+
+       /* make a private copy of BerElement */
+       AC_MEMCPY(&be, ref->lm_ber, sizeof(be));
+       
+       if ( ber_scanf( &be, "{v" /*}*/, &refs ) == LBER_ERROR ) {
+               rc = LDAP_DECODING_ERROR;
+               goto free_and_return;
+       }
+
+       if ( serverctrls == NULL ) {
+               rc = LDAP_SUCCESS;
+               goto free_and_return;
+       }
+
+       if ( ber_scanf( &be, /*{*/ "}" ) == LBER_ERROR ) {
+               rc = LDAP_DECODING_ERROR;
+               goto free_and_return;
+       }
+
+       rc = ldap_pvt_get_controls( &be, serverctrls );
+
+free_and_return:
+
+       if( referralsp != NULL ) {
+               /* provide references regradless of return code */
+               *referralsp = refs;
+
+       } else {
+               LDAP_VFREE( refs );
+       }
+
+       if( freeit ) {
+               ldap_msgfree( ref );
+       }
+
+       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;
+}