Merge remote branch 'origin/mdb.master'

[openldap] / libraries / librewrite / ldapmap.c

diff --git a/libraries/librewrite/ldapmap.c b/libraries/librewrite/ldapmap.c
index 428e57dfa9894ca23871671b8f4b7d84fea71c89..6041b2e80f2729fda27933b7e5c1df710eb0d1de 100644 (file)
--- a/libraries/librewrite/ldapmap.c
+++ b/libraries/librewrite/ldapmap.c
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2000-2006 The OpenLDAP Foundation.
+ * Copyright 2000-2011 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -23,6 +23,13 @@
 #include "rewrite-int.h"
 #include "rewrite-map.h"
 
+typedef enum {
+       MAP_LDAP_UNKNOWN,
+       MAP_LDAP_EVERYTIME,
+       MAP_LDAP_NOW,
+       MAP_LDAP_LATER
+} bindwhen_t;
+
 /*
  * LDAP map data structure
  */
@@ -33,10 +40,7 @@ struct ldap_map_data {
        char                           *lm_binddn;
        struct berval                   lm_cred;
 
-#define MAP_LDAP_EVERYTIME             0x00
-#define MAP_LDAP_NOW                   0x01
-#define MAP_LDAP_LATER                 0x02
-       int                             lm_when;
+       bindwhen_t                      lm_when;
 
        LDAP                           *lm_ld;
 
@@ -81,9 +85,8 @@ map_ldap_free(
        free( data );
 }
 
-void *
+static void *
 map_ldap_parse(
-               struct rewrite_info *info,
                const char *fname,
                int lineno,
                int argc,
@@ -91,9 +94,8 @@ map_ldap_parse(
 )
 {
        struct ldap_map_data *data;
-       char *p;
+       char *p, *uri;
 
-       assert( info != NULL );
        assert( fname != NULL );
        assert( argv != NULL );
 
@@ -110,13 +112,18 @@ map_ldap_parse(
                return NULL;
        }
 
-       data->lm_url = strdup( argv[ 0 ] );
+       uri = argv[ 0 ];
+       if ( strncasecmp( uri, "uri=", STRLENOF( "uri=" ) ) == 0 ) {
+               uri += STRLENOF( "uri=" );
+       }
+
+       data->lm_url = strdup( uri );
        if ( data->lm_url == NULL ) {
                map_ldap_free( data );
                return NULL;
        }
        
-       if ( ldap_url_parse( argv[ 0 ], &data->lm_lud ) != REWRITE_SUCCESS ) {
+       if ( ldap_url_parse( uri, &data->lm_lud ) != REWRITE_SUCCESS ) {
                Debug( LDAP_DEBUG_ANY,
                                "[%s:%d] illegal URI '%s'\n",
                                fname, lineno, argv[ 0 ] );
@@ -124,6 +131,7 @@ map_ldap_parse(
                return NULL;
        }
 
+       /* trim everything after [host][:port] */
        p = strchr( data->lm_url, '/' );
        assert( p[ 1 ] == '/' );
        if ( ( p = strchr( p + 2, '/' ) ) != NULL ) {
@@ -268,12 +276,16 @@ map_ldap_parse(
                }
        }
 
+       if ( data->lm_when == MAP_LDAP_UNKNOWN ) {
+               data->lm_when = MAP_LDAP_EVERYTIME;
+       }
+
        return ( void * )data;
 }
 
-int
+static int
 map_ldap_apply(
-               struct rewrite_builtin_map *map,
+               void *private,
                const char *filter,
                struct berval *val
 
@@ -282,14 +294,12 @@ map_ldap_apply(
        LDAP *ld;
        LDAPMessage *res = NULL, *entry;
        int rc;
-       struct ldap_map_data *data = ( struct ldap_map_data * )map->lb_private;
+       struct ldap_map_data *data = private;
        LDAPURLDesc *lud = data->lm_lud;
        
        int first_try = 1, set_version = 0;
 
-       assert( map != NULL );
-       assert( map->lb_type == REWRITE_BUILTIN_MAP_LDAP );
-       assert( map->lb_private != NULL );
+       assert( private != NULL );
        assert( filter != NULL );
        assert( val != NULL );
 
@@ -421,22 +431,24 @@ rc_return:;
        return rc;
 }
 
-int
+static int
 map_ldap_destroy(
-               struct rewrite_builtin_map **pmap
+               void *private
 )
 {
-       struct ldap_map_data *data;
+       struct ldap_map_data *data = private;
 
-       assert( pmap != NULL );
-       assert( *pmap != NULL );
+       assert( private != NULL );
        
-       data = ( struct ldap_map_data * )(*pmap)->lb_private;
-
        map_ldap_free( data );
 
-       (*pmap)->lb_private = NULL;
-
        return 0;
 }
 
+const rewrite_mapper rewrite_ldap_mapper = {
+       "ldap",
+       map_ldap_parse,
+       map_ldap_apply,
+       map_ldap_destroy
+};
+