#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"
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;
}
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",
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, argv[ 1 ] );
+ "multiple URIs must have "
+ "no DN part\n",
+ fname, lineno );
return( 1 );
}
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 ) {
dn.bv_val = argv[ 1 ];
dn.bv_len = strlen( argv[ 1 ] );
- if ( dnPrettyNormal( NULL, &dn, &pvnc, &nvnc ) != 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 ] );
dn.bv_val = argv[ 2 ];
dn.bv_len = strlen( argv[ 2 ] );
- if ( dnPrettyNormal( NULL, &dn, &prnc, &nrnc ) != 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 ] );
* FIXME: no extra rewrite capabilities should be added
* to the database
*/
- return suffix_massage_config( li->targets[ i ]->rwinfo,
+ return suffix_massage_config( li->targets[ i ]->rwmap.rwm_rw,
&pvnc, &nvnc, &prnc, &nrnc );
/* rewrite stuff ... */
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} [<local> | *] {<foreign> | *}\"\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} [<local> | *] {<foreign> | *}\"\n",
- fname, lineno );
- return 1;
- }
-
- if ( strcmp( argv[ 2 ], "*" ) == 0 ) {
- if ( argc < 4 || strcmp( argv[ 3 ], "*" ) == 0 ) {
- map->drop_missing = ( argc < 4 );
- return 0;
- }
- 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 )
- && ( 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 );
- 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,
- "%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;
}
- 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 );
-
- /* anything else */
- } else {
fprintf( stderr,
"%s: line %d: unknown directive \"%s\" in meta database definition"
" (ignored)\n",
projects / openldap / blobdiff