Use ldap_unbind_ext(3)

[openldap] / libraries / librewrite / config.c

diff --git a/libraries/librewrite/config.c b/libraries/librewrite/config.c
index 437d475cd9a14fe0b77103c50149128fa91d4f3e..9cf3ad98dc45f6c5f2de29fb0d647ba464567398 100644 (file)
--- a/libraries/librewrite/config.c
+++ b/libraries/librewrite/config.c
@@ -1,37 +1,27 @@
-/******************************************************************************
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright (C) 2000 Pierangelo Masarati, <ando@sys-net.it>
+ * Copyright 2000-2003 The OpenLDAP Foundation.
  * All rights reserved.
  *
- * Permission is granted to anyone to use this software for any purpose
- * on any computer system, and to alter it and redistribute it, subject
- * to the following restrictions:
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
  *
- * 1. The author is not responsible for the consequences of use of this
- * software, no matter how awful, even if they arise from flaws in it.
- *
- * 2. The origin of this software must not be misrepresented, either by
- * explicit claim or by omission.  Since few users ever read sources,
- * credits should appear in the documentation.
- *
- * 3. Altered versions must be plainly marked as such, and must not be
- * misrepresented as being the original software.  Since few users
- * ever read sources, credits should appear in the documentation.
- * 
- * 4. This notice may not be removed or altered.
- *
- ******************************************************************************/
+ * 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>.
+ */
+/* ACKNOWLEDGEMENT:
+ * This work was initially developed by Pierangelo Masarati for
+ * inclusion in OpenLDAP Software.
+ */
 
 #include <portable.h>
 
 #include "rewrite-int.h"
 #include "rewrite-map.h"
 
-/*
- * Global data
- */
-extern struct rewrite_context *__curr_context;
-
 /*
  * Parses a plugin map
  */
@@ -80,6 +70,7 @@ rewrite_parse(
                                        "[%s:%d] rewriteEngine needs 'state'\n%s",
                                        fname, lineno, "" );
                        return -1;
+
                } else if ( argc > 2 ) {
                        Debug( LDAP_DEBUG_ANY,
                                        "[%s:%d] extra fields in rewriteEngine"
@@ -89,8 +80,10 @@ rewrite_parse(
 
                if ( strcasecmp( argv[ 1 ], "on" ) == 0 ) {
                        info->li_state = REWRITE_ON;
+
                } else if ( strcasecmp( argv[ 1 ], "off" ) == 0 ) {
                        info->li_state = REWRITE_OFF;
+
                } else {
                        Debug( LDAP_DEBUG_ANY,
                                        "[%s:%d] unknown 'state' in rewriteEngine;"
@@ -128,12 +121,12 @@ rewrite_parse(
                 * Checks for existence (lots of contexts should be
                 * available by default ...)
                 */
-                __curr_context = rewrite_context_find( info, argv[ 1 ] );
-                if ( __curr_context == NULL ) {
-                        __curr_context = rewrite_context_create( info,
+                rewrite_int_curr_context = rewrite_context_find( info, argv[ 1 ] );
+                if ( rewrite_int_curr_context == NULL ) {
+                        rewrite_int_curr_context = rewrite_context_create( info,
                                         argv[ 1 ] );                       
                 }
-                if ( __curr_context == NULL ) {
+                if ( rewrite_int_curr_context == NULL ) {
                         return -1;
                 }
                                                
@@ -156,6 +149,7 @@ rewrite_parse(
                                                         " 'alias'\n%s",
                                                         fname, lineno, "" );
                                         return -1;
+
                                 } else if ( argc > 4 ) {
                                         Debug( LDAP_DEBUG_ANY,
                                                         "[%s:%d] extra fields in"
@@ -178,8 +172,9 @@ rewrite_parse(
                                         return -1;
                                 }
                                 
-                                __curr_context->lc_alias = aliased;
-                                __curr_context = aliased;
+                                rewrite_int_curr_context->lc_alias = aliased;
+                                rewrite_int_curr_context = aliased;
+
                         } else {
                                 Debug( LDAP_DEBUG_ANY,
                                                 "[%s:%d] extra fields"
@@ -200,6 +195,7 @@ rewrite_parse(
                                        " 'subst' ['flags']\n%s",
                                        fname, lineno, "" );
                        return -1;
+
                } else if ( argc > 4 ) {
                        Debug( LDAP_DEBUG_ANY,
                                        "[%s:%d] extra fields in rewriteRule"
@@ -207,22 +203,22 @@ rewrite_parse(
                                        fname, lineno, "" );
                }
 
-               if ( __curr_context == NULL ) {
+               if ( rewrite_int_curr_context == NULL ) {
                        Debug( LDAP_DEBUG_ANY,
                                        "[%s:%d] rewriteRule outside a"
                                        " context; will add to default\n%s",
                                        fname, lineno, "" );
-                       __curr_context = rewrite_context_find( info,
+                       rewrite_int_curr_context = rewrite_context_find( info,
                                        REWRITE_DEFAULT_CONTEXT );
 
                        /*
                         * Default context MUST exist in a properly initialized
                         * struct rewrite_info
                         */
-                       assert( __curr_context != NULL );
+                       assert( rewrite_int_curr_context != NULL );
                }
                
-               rc = rewrite_rule_compile( info, __curr_context, argv[ 1 ],
+               rc = rewrite_rule_compile( info, rewrite_int_curr_context, argv[ 1 ],
                                argv[ 2 ], ( argc == 4 ? argv[ 3 ] : "" ) );
        
        /*
@@ -278,8 +274,8 @@ rewrite_builtin_map_cmp(
 {
        const struct rewrite_builtin_map *m1, *m2;
 
-        m1 = ( struct rewrite_builtin_map * )c1;
-        m2 = ( struct rewrite_builtin_map * )c2;
+        m1 = ( const struct rewrite_builtin_map * )c1;
+        m2 = ( const struct rewrite_builtin_map * )c2;
 
         assert( m1 != NULL );
         assert( m2 != NULL );