/*
- * Copyright 1998-2001 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file
*
* Copyright 2001, Pierangelo Masarati, All rights reserved. <ando@sys-net.it>
#include "../back-ldap/back-ldap.h"
#include "back-meta.h"
-extern int
-suffix_massage_config(
- struct rewrite_info *info,
- int argc,
- char **argv
-);
-
static struct metatarget *
new_target( void )
{
return NULL;
}
- mapping = ch_calloc( 2, sizeof( struct ldapmapping ) );
- if ( mapping == NULL ) {
- free( lt );
- return NULL;
- }
- mapping->src = ch_strdup( "objectClass" );
- mapping->dst = ch_strdup( "objectClass" );
- mapping[ 1 ].src = mapping->src;
- mapping[ 1 ].dst = mapping->dst;
-
- avl_insert( <->at_map.map, ( caddr_t )mapping,
- mapping_cmp, mapping_dup );
- avl_insert( <->at_map.remap, ( caddr_t )&mapping[ 1 ],
- mapping_cmp, mapping_dup );
+ ldap_back_map_init( <->at_map, &mapping );
return lt;
}
/* URI of server to query */
if ( strcasecmp( argv[ 0 ], "uri" ) == 0 ) {
- int j, i = li->ntargets;
- LDAPURLDesc *ludp;
- char *last;
+ int i = li->ntargets;
+#if 0
+ int j;
+#endif /* uncomment if uri MUST be a branch of suffix */
+ LDAPURLDesc *ludp;
+ char *last;
+ struct berval dn;
+ int rc;
if ( argc != 2 ) {
fprintf( stderr,
/*
* copies and stores uri and suffix
*/
- li->targets[ i ]->suffix = ch_strdup( ludp->lud_dn );
+ dn.bv_val = ludp->lud_dn;
+ dn.bv_len = strlen( ludp->lud_dn );
+
+ rc = dnPrettyNormal( NULL, &dn, &li->targets[ i ]->psuffix,
+ &li->targets[ i ]->suffix );
+ if( rc != LDAP_SUCCESS ) {
+ fprintf( stderr, "%s: line %d: "
+ "target '%s' DN is invalid\n",
+ fname, lineno, argv[ 1 ] );
+ return( 1 );
+ }
+
li->targets[ i ]->uri = ch_strdup( argv[ 1 ] );
- last = strstr( li->targets[ i ]->uri,
- li->targets[ i ]->suffix );
+ last = strstr( li->targets[ i ]->uri, ludp->lud_dn );
assert( last != NULL );
- last[ 0 ] = '\0'; /* wasting memory ... */
-
- /*
- * Need to store the suffix in normalized form
- */
- (void) dn_normalize( li->targets[ i ]->suffix );
+ last[ 0 ] = '\0';
/*
* uri MUST be a branch of suffix!
*/
#if 0 /* too strict a constraint */
- if ( select_backend( li->targets[ i ]->suffix, 0 ) != be ) {
+ if ( select_backend( &li->targets[ i ]->suffix, 0, 0 ) != be ) {
fprintf( stderr,
"%s: line %d: <naming context> of URI does not refer to current backend"
" in \"uri <protocol>://<server>[:port]/<naming context>\" line\n",
/*
* uri MUST be a branch of a suffix!
*/
- if ( select_backend( li->targets[ i ]->suffix, 0 ) == NULL ) {
+ if ( select_backend( &li->targets[ i ]->suffix, 0, 0 ) == NULL ) {
fprintf( stderr,
"%s: line %d: <naming context> of URI does not resolve to a backend"
" in \"uri <protocol>://<server>[:port]/<naming context>\" line\n",
* or worked out, at least, in some manner
*/
for ( j = 0; j < i-1; j++ ) {
- if ( strcmp( li->targets[ i ]->suffix,
- li->targets[ j ]->suffix ) == 0 ) {
+ if ( dn_match( &li->targets[ i ]->suffix,
+ &li->targets[ j ]->suffix ) ) {
fprintf( stderr,
"%s: line %d: naming context \"%s\" already used"
" in \"uri <protocol>://<server>[:port]/<naming context>\" line\n",
ldap_free_urldesc( ludp );
- Debug( LDAP_DEBUG_CONFIG,
- "==>meta_back_db_config: URI \"%s\", suffix \"%s\"%s\n",
- li->targets[ i ]->uri, li->targets[ i ]->suffix, "" );
-
+#if 0
+ fprintf(stderr, "%s: line %d: URI \"%s\", suffix \"%s\"\n",
+ fname, lineno, li->targets[ i ]->uri,
+ li->targets[ i ]->psuffix.bv_val );
+#endif
+
/* default target directive */
} else if ( strcasecmp( argv[ 0 ], "default-target" ) == 0 ) {
- int i = li->ntargets-1;
+ int i = li->ntargets-1;
if ( argc == 1 ) {
if ( i < 0 ) {
/* name to use for meta_back_group */
} else if ( strcasecmp( argv[ 0 ], "binddn" ) == 0 ) {
- int i = li->ntargets-1;
+ int i = li->ntargets-1;
+ struct berval dn;
if ( i < 0 ) {
fprintf( stderr,
fname, lineno );
return 1;
}
- li->targets[ i ]->binddn = ch_strdup( argv[ 1 ] );
+
+ dn.bv_val = argv[ 1 ];
+ dn.bv_len = strlen( argv[ 1 ] );
+ if ( dnNormalize2( NULL, &dn, &li->targets[ i ]->binddn ) != LDAP_SUCCESS ) {
+ fprintf( stderr, "%s: line %d: "
+ "bind DN '%s' is invalid\n",
+ fname, lineno, argv[ 1 ] );
+ return( 1 );
+ }
/* password to use for meta_back_group */
} else if ( strcasecmp( argv[ 0 ], "bindpw" ) == 0 ) {
- int i = li->ntargets-1;
+ int i = li->ntargets-1;
if ( i < 0 ) {
fprintf( stderr,
fname, lineno );
return 1;
}
- li->targets[ i ]->bindpw = ch_strdup( argv[ 1 ] );
+ ber_str2bv( argv[ 1 ], 0L, 1, &li->targets[ i ]->bindpw );
+
+ /* name to use as pseudo-root dn */
+ } else if ( strcasecmp( argv[ 0 ], "pseudorootdn" ) == 0 ) {
+ int i = li->ntargets-1;
+ struct berval dn;
+
+ if ( i < 0 ) {
+ fprintf( stderr,
+ "%s: line %d: need \"uri\" directive first\n",
+ fname, lineno );
+ }
+
+ if ( argc != 2 ) {
+ fprintf( stderr,
+ "%s: line %d: missing name in \"pseudorootdn <name>\" line\n",
+ fname, lineno );
+ return 1;
+ }
+
+ dn.bv_val = argv[ 1 ];
+ dn.bv_len = strlen( argv[ 1 ] );
+ if ( dnNormalize2( NULL, &dn, &li->targets[ i ]->pseudorootdn ) != LDAP_SUCCESS ) {
+ fprintf( stderr, "%s: line %d: "
+ "pseudoroot DN '%s' is invalid\n",
+ fname, lineno, argv[ 1 ] );
+ return( 1 );
+ }
+
+ /* password to use as pseudo-root */
+ } else if ( strcasecmp( argv[ 0 ], "pseudorootpw" ) == 0 ) {
+ int i = li->ntargets-1;
+
+ if ( i < 0 ) {
+ fprintf( stderr,
+ "%s: line %d: need \"uri\" directive first\n",
+ fname, lineno );
+ }
+
+ if ( argc != 2 ) {
+ fprintf( stderr,
+ "%s: line %d: missing password in \"pseudorootpw <password>\" line\n",
+ fname, lineno );
+ return 1;
+ }
+ ber_str2bv( argv[ 1 ], 0L, 1, &li->targets[ i ]->pseudorootpw );
/* dn massaging */
} else if ( strcasecmp( argv[ 0 ], "suffixmassage" ) == 0 ) {
- BackendDB *tmp_be;
- int i = li->ntargets-1;
+ BackendDB *tmp_be;
+ int i = li->ntargets-1;
+ struct berval dn, nvnc, pvnc, nrnc, prnc;
if ( i < 0 ) {
fprintf( stderr,
fname, lineno );
return 1;
}
+
+ dn.bv_val = argv[ 1 ];
+ dn.bv_len = strlen( argv[ 1 ] );
+ if ( dnPrettyNormal( NULL, &dn, &pvnc, &nvnc ) != LDAP_SUCCESS ) {
+ fprintf( stderr, "%s: line %d: "
+ "suffix '%s' is invalid\n",
+ fname, lineno, argv[ 1 ] );
+ return 1;
+ }
- tmp_be = select_backend( argv[ 1 ], 0 );
+ tmp_be = select_backend( &nvnc, 0, 0 );
if ( tmp_be != NULL && tmp_be != be ) {
fprintf( stderr,
"%s: line %d: suffix already in use by another backend in"
" \"suffixMassage <suffix> <massaged suffix>\"\n",
fname, lineno );
+ free( pvnc.bv_val );
+ free( nvnc.bv_val );
return 1;
}
- tmp_be = select_backend( argv[ 2 ], 0 );
+ dn.bv_val = argv[ 2 ];
+ dn.bv_len = strlen( argv[ 2 ] );
+ if ( dnPrettyNormal( NULL, &dn, &prnc, &nrnc ) != LDAP_SUCCESS ) {
+ fprintf( stderr, "%s: line %d: "
+ "massaged suffix '%s' is invalid\n",
+ fname, lineno, argv[ 2 ] );
+ free( pvnc.bv_val );
+ free( nvnc.bv_val );
+ return 1;
+ }
+
+#if 0
+ tmp_be = select_backend( &nrnc, 0, 0 );
if ( tmp_be != NULL ) {
fprintf( stderr,
"%s: line %d: massaged suffix already in use by another backend in"
" \"suffixMassage <suffix> <massaged suffix>\"\n",
fname, lineno );
+ free( pvnc.bv_val );
+ free( nvnc.bv_val );
+ free( prnc.bv_val );
+ free( nrnc.bv_val );
return 1;
}
+#endif
/*
* The suffix massaging is emulated by means of the
* to the database
*/
return suffix_massage_config( li->targets[ i ]->rwinfo,
- argc, argv );
+ &pvnc, &nvnc, &prnc, &nrnc );
/* rewrite stuff ... */
} else if ( strncasecmp( argv[ 0 ], "rewrite", 7 ) == 0 ) {
- int i = li->ntargets-1;
+ int i = li->ntargets-1;
if ( i < 0 ) {
fprintf( stderr,
struct ldapmap *map;
struct ldapmapping *mapping;
char *src, *dst;
- int i = li->ntargets-1;
+ int i = li->ntargets-1;
if ( i < 0 ) {
fprintf( stderr,
if ( argc < 3 || argc > 4 ) {
fprintf( stderr,
- "%s: line %d: syntax is \"map {objectclass | attribute} {<source> | *} [<dest> | *]\"\n",
+ "%s: line %d: syntax is \"map {objectclass | attribute} [<local> | *] {<foreign> | *}\"\n",
fname, lineno );
return 1;
}
map = &li->targets[ i ]->at_map;
} else {
fprintf( stderr,
- "%s: line %d: syntax is \"map {objectclass | attribute} {<source> | *} [<dest> | *]\"\n",
+ "%s: line %d: syntax is \"map {objectclass | attribute} [<local> | *] {<foreign> | *}\"\n",
fname, lineno );
return 1;
}
- if ( strcasecmp( argv[ 2 ], "*" ) != 0 ) {
- src = argv[ 2 ];
- if ( argc < 4 ) {
- dst = "";
- } else if ( strcasecmp( argv[ 3 ], "*" ) == 0 ) {
- dst = src;
- } else {
- dst = argv[ 3 ];
- }
- } else {
- if ( argc < 4 ) {
- map->drop_missing = 1;
- return 0;
- }
- if ( strcasecmp( argv[ 3 ], "*" ) == 0 ) {
- map->drop_missing = 0;
+ if ( strcmp( argv[ 2 ], "*" ) == 0 ) {
+ if ( argc < 4 || strcmp( argv[ 3 ], "*" ) == 0 ) {
+ map->drop_missing = ( argc < 4 );
return 0;
}
-
- src = argv[ 3 ];
- dst = src;
+ src = dst = argv[ 3 ];
+ } else if ( argc < 4 ) {
+ src = "";
+ dst = argv[ 2 ];
+ } else {
+ src = argv[ 2 ];
+ dst = ( strcmp( argv[ 3 ], "*" ) == 0 ? src : argv[ 3 ] );
}
if ( ( map == &li->targets[ i ]->at_map )
fname, lineno );
return 1;
}
- mapping->src = ch_strdup( src );
- mapping->dst = ch_strdup( dst );
- if ( *dst != 0 ) {
- mapping[ 1 ].src = mapping->dst;
- mapping[ 1 ].dst = mapping->src;
- } else {
- mapping[ 1 ].src = mapping->src;
- mapping[ 1 ].dst = mapping->dst;
- }
-
- if ( avl_find( map->map, ( caddr_t )mapping,
- mapping_cmp ) != NULL
+ ber_str2bv( src, 0, 1, &mapping->src );
+ ber_str2bv( dst, 0, 1, &mapping->dst );
+ mapping[ 1 ].src = mapping->dst;
+ mapping[ 1 ].dst = mapping->src;
+
+ if ( (*src != '\0' &&
+ avl_find( map->map, ( caddr_t )mapping,
+ mapping_cmp ) != NULL)
|| avl_find( map->remap, ( caddr_t )&mapping[ 1 ],
mapping_cmp ) != NULL) {
fprintf( stderr,
return 0;
}
- avl_insert( &map->map, ( caddr_t )mapping,
- mapping_cmp, mapping_dup );
+ if ( *src != '\0' )
+ avl_insert( &map->map, ( caddr_t )mapping,
+ mapping_cmp, mapping_dup );
avl_insert( &map->remap, ( caddr_t )&mapping[ 1 ],
mapping_cmp, mapping_dup );
projects / openldap / blobdiff