/*
- * Copyright 1998-2001 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file
*
* Copyright 2001, Pierangelo Masarati, All rights reserved. <ando@sys-net.it>
#include "slap.h"
#include "../back-ldap/back-ldap.h"
+#undef ldap_debug /* silence a warning in ldap-int.h */
+#include "../../../libraries/libldap/ldap-int.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;
}
- lt->rwinfo = rewrite_info_init( REWRITE_MODE_USE_DEFAULT );
- if ( lt->rwinfo == NULL ) {
+ lt->rwmap.rwm_rw = rewrite_info_init( REWRITE_MODE_USE_DEFAULT );
+ if ( lt->rwmap.rwm_rw == NULL ) {
free( lt );
return NULL;
}
- ldap_back_map_init( <->at_map, &mapping );
+ ldap_back_map_init( <->rwmap.rwm_at, &mapping );
return lt;
}
#if 0
int j;
#endif /* uncomment if uri MUST be a branch of suffix */
- LDAPURLDesc *ludp;
- char *last;
+ LDAPURLDesc *ludp, *tmpludp;
struct berval dn;
int rc;
/*
* uri MUST be legal!
*/
- if ( ldap_url_parse( argv[ 1 ], &ludp ) != LDAP_SUCCESS ) {
+ if ( ldap_url_parselist_ext( &ludp, argv[ 1 ], "\t" ) != LDAP_SUCCESS ) {
fprintf( stderr,
"%s: line %d: unable to parse URI"
" in \"uri <protocol>://<server>[:port]/<naming context>\" line\n",
dn.bv_len = strlen( ludp->lud_dn );
rc = dnPrettyNormal( NULL, &dn, &li->targets[ i ]->psuffix,
- &li->targets[ i ]->suffix );
+ &li->targets[ i ]->suffix, NULL );
if( rc != LDAP_SUCCESS ) {
fprintf( stderr, "%s: line %d: "
"target '%s' DN is invalid\n",
return( 1 );
}
- li->targets[ i ]->uri = ch_strdup( argv[ 1 ] );
- last = strstr( li->targets[ i ]->uri, ludp->lud_dn );
- assert( last != NULL );
- last[ 0 ] = '\0';
+ ludp->lud_dn[ 0 ] = '\0';
+
+ for ( tmpludp = ludp->lud_next; tmpludp; tmpludp = tmpludp->lud_next ) {
+ if ( tmpludp->lud_dn != NULL && tmpludp->lud_dn[ 0 ] != '\0' ) {
+ fprintf( stderr, "%s: line %d: "
+ "multiple URIs must have "
+ "no DN part\n",
+ fname, lineno );
+ return( 1 );
+
+ }
+ }
+
+ li->targets[ i ]->uri = ldap_url_list2urls( ludp );
+ ldap_free_urllist( ludp );
+ if ( li->targets[ i ]->uri == NULL) {
+ fprintf( stderr, "%s: line %d: no memory?\n",
+ fname, lineno );
+ return( 1 );
+ }
/*
* uri MUST be a branch of suffix!
* or worked out, at least, in some manner
*/
for ( j = 0; j < i-1; j++ ) {
- if ( strcmp( li->targets[ i ]->suffix.bv_val,
- li->targets[ j ]->suffix.bv_val ) == 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",
}
}
#endif
-
- ldap_free_urldesc( ludp );
#if 0
fprintf(stderr, "%s: line %d: URI \"%s\", suffix \"%s\"\n",
li->cache.ttl = atol( argv[ 1 ] );
}
+ /* network timeout when connecting to ldap servers */
+ } else if ( strcasecmp( argv[ 0 ], "network-timeout" ) == 0 ) {
+ if ( argc != 2 ) {
+ fprintf( stderr,
+ "%s: line %d: missing network timeout in \"network-timeout <seconds>\" line\n",
+ fname, lineno );
+ return 1;
+ }
+ li->network_timeout = atol(argv[ 1 ]);
+
/* name to use for meta_back_group */
} else if ( strcasecmp( argv[ 0 ], "binddn" ) == 0 ) {
int i = li->ntargets-1;
fprintf( stderr,
"%s: line %d: need \"uri\" directive first\n",
fname, lineno );
+ return 1;
}
if ( argc != 2 ) {
dn.bv_val = argv[ 1 ];
dn.bv_len = strlen( argv[ 1 ] );
- if ( dnNormalize2( NULL, &dn, &li->targets[ i ]->binddn ) != LDAP_SUCCESS ) {
+ if ( dnNormalize( 0, NULL, NULL, &dn, &li->targets[ i ]->binddn,
+ NULL ) != LDAP_SUCCESS )
+ {
fprintf( stderr, "%s: line %d: "
"bind DN '%s' is invalid\n",
fname, lineno, argv[ 1 ] );
fprintf( stderr,
"%s: line %d: need \"uri\" directive first\n",
fname, lineno );
+ return 1;
}
if ( argc != 2 ) {
}
ber_str2bv( argv[ 1 ], 0L, 1, &li->targets[ i ]->bindpw );
+ /* save bind creds for referral rebinds? */
+ } else if ( strcasecmp( argv[0], "rebind-as-user" ) == 0 ) {
+ if (argc != 1) {
+ fprintf( stderr,
+ "%s: line %d: rebind-as-user takes no arguments\n",
+ fname, lineno );
+ return( 1 );
+ }
+ li->savecred = 1;
+
/* name to use as pseudo-root dn */
} else if ( strcasecmp( argv[ 0 ], "pseudorootdn" ) == 0 ) {
int i = li->ntargets-1;
fprintf( stderr,
"%s: line %d: need \"uri\" directive first\n",
fname, lineno );
+ return 1;
}
if ( argc != 2 ) {
dn.bv_val = argv[ 1 ];
dn.bv_len = strlen( argv[ 1 ] );
- if ( dnNormalize2( NULL, &dn, &li->targets[ i ]->pseudorootdn ) != LDAP_SUCCESS ) {
+ if ( dnNormalize( 0, NULL, NULL, &dn,
+ &li->targets[ i ]->pseudorootdn, NULL ) != LDAP_SUCCESS )
+ {
fprintf( stderr, "%s: line %d: "
"pseudoroot DN '%s' is invalid\n",
fname, lineno, argv[ 1 ] );
fprintf( stderr,
"%s: line %d: need \"uri\" directive first\n",
fname, lineno );
+ return 1;
}
if ( argc != 2 ) {
} else if ( strcasecmp( argv[ 0 ], "suffixmassage" ) == 0 ) {
BackendDB *tmp_be;
int i = li->ntargets-1;
- struct berval dn, ndn;
+ struct berval dn, nvnc, pvnc, nrnc, prnc;
if ( i < 0 ) {
fprintf( stderr,
dn.bv_val = argv[ 1 ];
dn.bv_len = strlen( argv[ 1 ] );
- if ( dnNormalize2( NULL, &dn, &ndn ) != LDAP_SUCCESS ) {
+ if ( dnPrettyNormal( NULL, &dn, &pvnc, &nvnc, NULL ) != LDAP_SUCCESS ) {
fprintf( stderr, "%s: line %d: "
"suffix '%s' is invalid\n",
fname, lineno, argv[ 1 ] );
return 1;
}
- tmp_be = select_backend( &ndn, 0, 0 );
- free( ndn.bv_val );
+ 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;
}
dn.bv_val = argv[ 2 ];
dn.bv_len = strlen( argv[ 2 ] );
- if ( dnNormalize2( NULL, &dn, &ndn ) != LDAP_SUCCESS ) {
+ if ( dnPrettyNormal( NULL, &dn, &prnc, &nrnc, NULL ) != 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;
}
-
- tmp_be = select_backend( &ndn, 0, 0 );
- free( ndn.bv_val );
+
+#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
* FIXME: no extra rewrite capabilities should be added
* to the database
*/
- return suffix_massage_config( li->targets[ i ]->rwinfo,
- argc, argv );
+ return suffix_massage_config( li->targets[ i ]->rwmap.rwm_rw,
+ &pvnc, &nvnc, &prnc, &nrnc );
/* rewrite stuff ... */
} else if ( strncasecmp( argv[ 0 ], "rewrite", 7 ) == 0 ) {
int i = li->ntargets-1;
if ( i < 0 ) {
- fprintf( stderr,
- "%s: line %d: need \"uri\" directive first\n",
- fname, lineno );
+ if ( strcasecmp( argv[0], "rewriteEngine" ) == 0 ) {
+ li->rwinfo = rewrite_info_init( REWRITE_MODE_USE_DEFAULT );
+ }
+ return rewrite_parse(li->rwinfo, fname, lineno,
+ argc, argv);
}
- return rewrite_parse( li->targets[ i ]->rwinfo, fname, lineno,
+ return rewrite_parse( li->targets[ i ]->rwmap.rwm_rw, fname, lineno,
argc, argv );
/* objectclass/attribute mapping */
} else if ( strcasecmp( argv[ 0 ], "map" ) == 0 ) {
- struct ldapmap *map;
- struct ldapmapping *mapping;
- char *src, *dst;
int i = li->ntargets-1;
if ( i < 0 ) {
fprintf( stderr,
"%s: line %d: need \"uri\" directive first\n",
fname, lineno );
- }
-
-
- if ( argc < 3 || argc > 4 ) {
- fprintf( stderr,
- "%s: line %d: syntax is \"map {objectclass | attribute} {<source> | *} [<dest> | *]\"\n",
- fname, lineno );
- return 1;
- }
-
- if ( strcasecmp( argv[ 1 ], "objectClass" ) == 0 ) {
- map = &li->targets[ i ]->oc_map;
- } else if ( strcasecmp( argv[ 1 ], "attribute" ) == 0 ) {
- map = &li->targets[ i ]->at_map;
- } else {
- fprintf( stderr,
- "%s: line %d: syntax is \"map {objectclass | attribute} {<source> | *} [<dest> | *]\"\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;
- return 0;
- }
-
- src = argv[ 3 ];
- dst = src;
- }
-
- if ( ( map == &li->targets[ i ]->at_map )
- && ( strcasecmp( src, "objectclass" ) == 0
- || strcasecmp( dst, "objectclass" ) == 0 ) ) {
- fprintf( stderr,
- "%s: line %d: objectclass attribute cannot be mapped\n",
- fname, lineno );
- }
-
- mapping = ch_calloc( 2, sizeof( struct ldapmapping ) );
- if ( mapping == NULL ) {
- fprintf( stderr,
- "%s: line %d: out of memory\n",
- fname, lineno );
- return 1;
- }
- ber_str2bv( src, 0, 1, &mapping->src );
- ber_str2bv( dst, 0, 1, &mapping->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
- || avl_find( map->remap, ( caddr_t )&mapping[ 1 ],
- mapping_cmp ) != NULL) {
- fprintf( stderr,
- "%s: line %d: duplicate mapping found (ignored)\n",
- fname, lineno );
+ return ldap_back_map_config( &li->targets[ i ]->rwmap.rwm_oc,
+ &li->targets[ i ]->rwmap.rwm_at,
+ fname, lineno, argc, argv );
+ /* anything else */
+ } else {
+ if ( meta_back_cache_config( be, fname, lineno, argc, argv ) == 0 ) {
return 0;
}
- avl_insert( &map->map, ( caddr_t )mapping,
- mapping_cmp, mapping_dup );
- avl_insert( &map->remap, ( caddr_t )&mapping[ 1 ],
- mapping_cmp, mapping_dup );
-
- /* anything else */
- } else {
fprintf( stderr,
"%s: line %d: unknown directive \"%s\" in meta database definition"
" (ignored)\n",
projects / openldap / blobdiff