X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-meta%2Fconfig.c;h=62fcd5f071eeb5d7c33b0f436ae577d1cd473835;hb=52165180f7713b5fdebef933a9dca8842daa2e2a;hp=a5ce0d2e34df14d6c7928ac17fa5ba237da1cf95;hpb=e3a19bfa3238cddc26d8c94cfea19e9334c291ee;p=openldap diff --git a/servers/slapd/back-meta/config.c b/servers/slapd/back-meta/config.c index a5ce0d2e34..62fcd5f071 100644 --- a/servers/slapd/back-meta/config.c +++ b/servers/slapd/back-meta/config.c @@ -34,47 +34,39 @@ #include "../../../libraries/libldap/ldap-int.h" #include "back-meta.h" -static struct metatarget * -new_target( void ) +static int +new_target( + metatarget_t *mt ) { - struct metatarget *lt; - struct ldapmapping *mapping; + struct ldapmapping *mapping; + char *rargv[ 3 ]; - lt = ch_calloc( sizeof( struct metatarget ), 1 ); - if ( lt == NULL ) { - return NULL; - } + memset( mt, 0, sizeof( metatarget_t ) ); - lt->mt_rwmap.rwm_rw = rewrite_info_init( REWRITE_MODE_USE_DEFAULT ); - if ( lt->mt_rwmap.rwm_rw == NULL ) { - free( lt ); - return NULL; + mt->mt_rwmap.rwm_rw = rewrite_info_init( REWRITE_MODE_USE_DEFAULT ); + if ( mt->mt_rwmap.rwm_rw == NULL ) { + return -1; } - { - char *rargv[3]; - /* - * the filter rewrite as a string must be disabled - * by default; it can be re-enabled by adding rules; - * this creates an empty rewriteContext - */ - rargv[ 0 ] = "rewriteContext"; - rargv[ 1 ] = "searchFilter"; - rargv[ 2 ] = NULL; - rewrite_parse( lt->mt_rwmap.rwm_rw, "", - 1, 2, rargv ); - - rargv[ 0 ] = "rewriteContext"; - rargv[ 1 ] = "default"; - rargv[ 2 ] = NULL; - rewrite_parse( lt->mt_rwmap.rwm_rw, "", - 1, 2, rargv ); - } + /* + * the filter rewrite as a string must be disabled + * by default; it can be re-enabled by adding rules; + * this creates an empty rewriteContext + */ + rargv[ 0 ] = "rewriteContext"; + rargv[ 1 ] = "searchFilter"; + rargv[ 2 ] = NULL; + rewrite_parse( mt->mt_rwmap.rwm_rw, "", 1, 2, rargv ); - ldap_back_map_init( <->mt_rwmap.rwm_at, &mapping ); + rargv[ 0 ] = "rewriteContext"; + rargv[ 1 ] = "default"; + rargv[ 2 ] = NULL; + rewrite_parse( mt->mt_rwmap.rwm_rw, "", 1, 2, rargv ); + + ldap_back_map_init( &mt->mt_rwmap.rwm_at, &mapping ); - return lt; + return 0; } int @@ -86,9 +78,9 @@ meta_back_db_config( char **argv ) { - struct metainfo *li = ( struct metainfo * )be->be_private; + metainfo_t *mi = ( metainfo_t * )be->be_private; - if ( li == NULL ) { + if ( mi == NULL ) { fprintf( stderr, "%s: line %d: meta backend info is null!\n", fname, lineno ); @@ -97,7 +89,7 @@ meta_back_db_config( /* URI of server to query */ if ( strcasecmp( argv[ 0 ], "uri" ) == 0 ) { - int i = li->ntargets; + int i = mi->mi_ntargets; #if 0 int j; #endif /* uncomment if uri MUST be a branch of suffix */ @@ -113,11 +105,11 @@ meta_back_db_config( return 1; } - ++li->ntargets; + ++mi->mi_ntargets; - li->targets = ch_realloc( li->targets, - sizeof( struct metatarget *)*li->ntargets ); - if ( li->targets == NULL ) { + mi->mi_targets = ( metatarget_t * )ch_realloc( mi->mi_targets, + sizeof( metatarget_t ) * mi->mi_ntargets ); + if ( mi->mi_targets == NULL ) { fprintf( stderr, "%s: line %d: out of memory while storing server name" " in \"uri ://[:port]/\" line\n", @@ -125,7 +117,7 @@ meta_back_db_config( return 1; } - if ( ( li->targets[ i ] = new_target() ) == NULL ) { + if ( new_target( &mi->mi_targets[ i ] ) != 0 ) { fprintf( stderr, "%s: line %d: unable to init server" " in \"uri ://[:port]/\" line\n", @@ -133,6 +125,10 @@ meta_back_db_config( return 1; } + mi->mi_targets[ i ].mt_nretries = mi->mi_nretries; + mi->mi_targets[ i ].mt_flags = mi->flags; + mi->mi_targets[ i ].mt_version = mi->mi_version; + /* * uri MUST be legal! */ @@ -161,8 +157,8 @@ meta_back_db_config( dn.bv_val = ludp->lud_dn; dn.bv_len = strlen( ludp->lud_dn ); - rc = dnPrettyNormal( NULL, &dn, &li->targets[ i ]->mt_psuffix, - &li->targets[ i ]->mt_nsuffix, NULL ); + rc = dnPrettyNormal( NULL, &dn, &mi->mi_targets[ i ].mt_psuffix, + &mi->mi_targets[ i ].mt_nsuffix, NULL ); if( rc != LDAP_SUCCESS ) { fprintf( stderr, "%s: line %d: " "target '%s' DN is invalid\n", @@ -188,9 +184,9 @@ meta_back_db_config( } } - li->targets[ i ]->mt_uri = ldap_url_list2urls( ludp ); + mi->mi_targets[ i ].mt_uri = ldap_url_list2urls( ludp ); ldap_free_urllist( ludp ); - if ( li->targets[ i ]->mt_uri == NULL) { + if ( mi->mi_targets[ i ].mt_uri == NULL) { fprintf( stderr, "%s: line %d: no memory?\n", fname, lineno ); return( 1 ); @@ -200,7 +196,7 @@ meta_back_db_config( * uri MUST be a branch of suffix! */ #if 0 /* too strict a constraint */ - if ( select_backend( &li->targets[ i ]->suffix, 0, 0 ) != be ) { + if ( select_backend( &mi->mi_targets[ i ].suffix, 0, 0 ) != be ) { fprintf( stderr, "%s: line %d: of URI does not refer to current backend" " in \"uri ://[:port]/\" line\n", @@ -211,7 +207,7 @@ meta_back_db_config( /* * uri MUST be a branch of a suffix! */ - if ( select_backend( &li->targets[ i ]->mt_nsuffix, 0, 0 ) == NULL ) { + if ( select_backend( &mi->mi_targets[ i ].mt_nsuffix, 0, 0 ) == NULL ) { fprintf( stderr, "%s: line %d: of URI does not resolve to a backend" " in \"uri ://[:port]/\" line\n", @@ -220,34 +216,9 @@ meta_back_db_config( } #endif -#if 0 - /* - * uri MUST not be used by other URIs! - * - * FIXME: this limitation may be removed, - * or worked out, at least, in some manner - */ - for ( j = 0; j < i-1; j++ ) { - if ( dn_match( &li->targets[ i ]->suffix, - &li->targets[ j ]->suffix ) ) { - fprintf( stderr, - "%s: line %d: naming context \"%s\" already used" - " in \"uri ://[:port]/\" line\n", - fname, lineno, last+1 ); - return 1; - } - } -#endif - -#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 = mi->mi_ntargets - 1; if ( argc == 1 ) { if ( i < 0 ) { @@ -257,7 +228,7 @@ meta_back_db_config( fname, lineno ); return 1; } - li->defaulttarget = i; + mi->mi_defaulttarget = i; } else { if ( strcasecmp( argv[ 1 ], "none" ) == 0 ) { if ( i >= 0 ) { @@ -266,16 +237,18 @@ meta_back_db_config( " should go before uri definitions\n", fname, lineno ); } - li->defaulttarget = META_DEFAULT_TARGET_NONE; + mi->mi_defaulttarget = META_DEFAULT_TARGET_NONE; + } else { - int n = atoi( argv[ 1 ] ); - if ( n < 1 || n >= i ) { + char *next; + int n = strtol( argv[ 1 ], &next, 10 ); + if ( n < 0 || n >= i - 1 ) { fprintf( stderr, "%s: line %d: illegal target number %d\n", fname, lineno, n ); return 1; } - li->defaulttarget = n-1; + mi->mi_defaulttarget = n; } } @@ -289,11 +262,11 @@ meta_back_db_config( } if ( strcasecmp( argv[ 1 ], "forever" ) == 0 ) { - li->cache.ttl = META_DNCACHE_FOREVER; + mi->mi_cache.ttl = META_DNCACHE_FOREVER; } else if ( strcasecmp( argv[ 1 ], "disabled" ) == 0 ) { - li->cache.ttl = META_DNCACHE_DISABLED; + mi->mi_cache.ttl = META_DNCACHE_DISABLED; } else { - li->cache.ttl = atol( argv[ 1 ] ); + mi->mi_cache.ttl = atol( argv[ 1 ] ); } /* network timeout when connecting to ldap servers */ @@ -304,13 +277,13 @@ meta_back_db_config( fname, lineno ); return 1; } - li->network_timeout = atol(argv[ 1 ]); + mi->mi_network_timeout = atol(argv[ 1 ]); /* name to use for meta_back_group */ } else if ( strcasecmp( argv[ 0 ], "acl-authcDN" ) == 0 || strcasecmp( argv[ 0 ], "binddn" ) == 0 ) { - int i = li->ntargets-1; + int i = mi->mi_ntargets - 1; struct berval dn; if ( i < 0 ) { @@ -337,7 +310,7 @@ meta_back_db_config( dn.bv_val = argv[ 1 ]; dn.bv_len = strlen( argv[ 1 ] ); - if ( dnNormalize( 0, NULL, NULL, &dn, &li->targets[ i ]->mt_binddn, + if ( dnNormalize( 0, NULL, NULL, &dn, &mi->mi_targets[ i ].mt_binddn, NULL ) != LDAP_SUCCESS ) { fprintf( stderr, "%s: line %d: " @@ -350,7 +323,7 @@ meta_back_db_config( } else if ( strcasecmp( argv[ 0 ], "acl-passwd" ) == 0 || strcasecmp( argv[ 0 ], "bindpw" ) == 0 ) { - int i = li->ntargets-1; + int i = mi->mi_ntargets - 1; if ( i < 0 ) { fprintf( stderr, @@ -374,42 +347,154 @@ meta_back_db_config( /* FIXME: some day we'll need to throw an error */ } - ber_str2bv( argv[ 1 ], 0L, 1, &li->targets[ i ]->mt_bindpw ); + ber_str2bv( argv[ 1 ], 0L, 1, &mi->mi_targets[ i ].mt_bindpw ); /* save bind creds for referral rebinds? */ - } else if ( strcasecmp( argv[0], "rebind-as-user" ) == 0 ) { - if (argc != 1) { + } else if ( strcasecmp( argv[ 0 ], "rebind-as-user" ) == 0 ) { + if ( argc > 2 ) { fprintf( stderr, - "%s: line %d: rebind-as-user takes no arguments\n", + "%s: line %d: \"rebind-as-user {NO|yes}\" takes 1 argument.\n", fname, lineno ); return( 1 ); } - li->flags |= LDAP_BACK_F_SAVECRED; + if ( argc == 1 ) { + fprintf( stderr, + "%s: line %d: deprecated use of \"rebind-as-user {NO|yes}\" with no arguments.\n", + fname, lineno ); + mi->flags |= LDAP_BACK_F_SAVECRED; + + } else { + if ( strcasecmp( argv[ 1 ], "no" ) == 0 ) { + mi->flags &= ~LDAP_BACK_F_SAVECRED; + + } else if ( strcasecmp( argv[ 1 ], "yes" ) == 0 ) { + mi->flags |= LDAP_BACK_F_SAVECRED; + + } else { + fprintf( stderr, + "%s: line %d: \"rebind-as-user {NO|yes}\" unknown argument \"%s\".\n", + fname, lineno, argv[ 1 ] ); + return 1; + } + } + + } else if ( strcasecmp( argv[ 0 ], "chase-referrals" ) == 0 ) { + unsigned *flagsp = mi->mi_ntargets ? + &mi->mi_targets[ mi->mi_ntargets - 1 ].mt_flags + : &mi->flags; + + if ( argc != 2 ) { + fprintf( stderr, + "%s: line %d: \"chase-referrals\" needs 1 argument.\n", + fname, lineno ); + return( 1 ); + } + + /* this is the default; we add it because the default might change... */ + if ( strcasecmp( argv[ 1 ], "yes" ) == 0 ) { + *flagsp |= LDAP_BACK_F_CHASE_REFERRALS; + + } else if ( strcasecmp( argv[ 1 ], "no" ) == 0 ) { + *flagsp &= ~LDAP_BACK_F_CHASE_REFERRALS; + + } else { + fprintf( stderr, + "%s: line %d: \"chase-referrals {YES|no}\": unknown argument \"%s\".\n", + fname, lineno, argv[ 1 ] ); + return( 1 ); + } + + } else if ( strcasecmp( argv[ 0 ], "tls" ) == 0 ) { + unsigned *flagsp = mi->mi_ntargets ? + &mi->mi_targets[ mi->mi_ntargets - 1 ].mt_flags + : &mi->flags; - } else if ( strcasecmp( argv[0], "chase-referrals" ) == 0 ) { - if ( argc != 1 ) { + if ( argc != 2 ) { fprintf( stderr, - "%s: line %d: \"chase-referrals\" takes no arguments\n", + "%s: line %d: \"tls \" needs 1 argument.\n", fname, lineno ); return( 1 ); } - li->flags |= LDAP_BACK_F_CHASE_REFERRALS; + /* start */ + if ( strcasecmp( argv[ 1 ], "start" ) == 0 ) { + *flagsp |= ( LDAP_BACK_F_USE_TLS | LDAP_BACK_F_TLS_CRITICAL ); + + /* try start tls */ + } else if ( strcasecmp( argv[ 1 ], "try-start" ) == 0 ) { + *flagsp &= ~LDAP_BACK_F_TLS_CRITICAL; + *flagsp |= LDAP_BACK_F_USE_TLS; + + /* propagate start tls */ + } else if ( strcasecmp( argv[ 1 ], "propagate" ) == 0 ) { + *flagsp |= ( LDAP_BACK_F_PROPAGATE_TLS | LDAP_BACK_F_TLS_CRITICAL ); + + /* try start tls */ + } else if ( strcasecmp( argv[ 1 ], "try-propagate" ) == 0 ) { + *flagsp &= ~LDAP_BACK_F_TLS_CRITICAL; + *flagsp |= LDAP_BACK_F_PROPAGATE_TLS; - } else if ( strcasecmp( argv[0], "dont-chase-referrals" ) == 0 ) { - if ( argc != 1 ) { + } else { fprintf( stderr, - "%s: line %d: \"dont-chase-referrals\" takes no arguments\n", + "%s: line %d: \"tls \": unknown argument \"%s\".\n", + fname, lineno, argv[ 1 ] ); + return( 1 ); + } + + } else if ( strcasecmp( argv[ 0 ], "t-f-support" ) == 0 ) { + unsigned *flagsp = mi->mi_ntargets ? + &mi->mi_targets[ mi->mi_ntargets - 1 ].mt_flags + : &mi->flags; + + if ( argc != 2 ) { + fprintf( stderr, + "%s: line %d: \"t-f-support {NO|yes|discover}\" needs 1 argument.\n", fname, lineno ); return( 1 ); } - li->flags &= ~LDAP_BACK_F_CHASE_REFERRALS; + if ( strcasecmp( argv[ 1 ], "no" ) == 0 ) { + *flagsp &= ~(LDAP_BACK_F_SUPPORT_T_F|LDAP_BACK_F_SUPPORT_T_F_DISCOVER); + + } else if ( strcasecmp( argv[ 1 ], "yes" ) == 0 ) { + *flagsp |= LDAP_BACK_F_SUPPORT_T_F; + + } else if ( strcasecmp( argv[ 1 ], "discover" ) == 0 ) { + *flagsp |= LDAP_BACK_F_SUPPORT_T_F_DISCOVER; + + } else { + fprintf( stderr, + "%s: line %d: unknown value \"%s\" for \"t-f-support {no|yes|discover}\".\n", + fname, lineno, argv[ 1 ] ); + return 1; + } + + /* onerr? */ + } else if ( strcasecmp( argv[ 0 ], "onerr" ) == 0 ) { + if ( argc != 2 ) { + fprintf( stderr, + "%s: line %d: \"onerr {CONTINUE|stop}\" takes 1 argument\n", + fname, lineno ); + return( 1 ); + } + + if ( strcasecmp( argv[ 1 ], "continue" ) == 0 ) { + mi->flags &= ~META_BACK_F_ONERR_STOP; + + } else if ( strcasecmp( argv[ 1 ], "stop" ) == 0 ) { + mi->flags |= META_BACK_F_ONERR_STOP; + + } else { + fprintf( stderr, + "%s: line %d: \"onerr {CONTINUE|stop}\": invalid arg \"%s\".\n", + fname, lineno, argv[ 1 ] ); + return 1; + } /* name to use as pseudo-root dn */ } else if ( strcasecmp( argv[ 0 ], "pseudorootdn" ) == 0 ) { - int i = li->ntargets-1; + int i = mi->mi_ntargets - 1; struct berval dn; if ( i < 0 ) { @@ -429,7 +514,7 @@ meta_back_db_config( dn.bv_val = argv[ 1 ]; dn.bv_len = strlen( argv[ 1 ] ); if ( dnNormalize( 0, NULL, NULL, &dn, - &li->targets[ i ]->mt_pseudorootdn, NULL ) != LDAP_SUCCESS ) + &mi->mi_targets[ i ].mt_pseudorootdn, NULL ) != LDAP_SUCCESS ) { fprintf( stderr, "%s: line %d: " "pseudoroot DN '%s' is invalid\n", @@ -439,7 +524,7 @@ meta_back_db_config( /* password to use as pseudo-root */ } else if ( strcasecmp( argv[ 0 ], "pseudorootpw" ) == 0 ) { - int i = li->ntargets-1; + int i = mi->mi_ntargets - 1; if ( i < 0 ) { fprintf( stderr, @@ -454,12 +539,12 @@ meta_back_db_config( fname, lineno ); return 1; } - ber_str2bv( argv[ 1 ], 0L, 1, &li->targets[ i ]->mt_pseudorootpw ); + ber_str2bv( argv[ 1 ], 0L, 1, &mi->mi_targets[ i ].mt_pseudorootpw ); /* dn massaging */ } else if ( strcasecmp( argv[ 0 ], "suffixmassage" ) == 0 ) { BackendDB *tmp_be; - int i = li->ntargets-1; + int i = mi->mi_ntargets - 1; struct berval dn, nvnc, pvnc, nrnc, prnc; if ( i < 0 ) { @@ -539,27 +624,26 @@ meta_back_db_config( * FIXME: no extra rewrite capabilities should be added * to the database */ - return suffix_massage_config( li->targets[ i ]->mt_rwmap.rwm_rw, + return suffix_massage_config( mi->mi_targets[ i ].mt_rwmap.rwm_rw, &pvnc, &nvnc, &prnc, &nrnc ); /* rewrite stuff ... */ } else if ( strncasecmp( argv[ 0 ], "rewrite", 7 ) == 0 ) { - int i = li->ntargets-1; + int i = mi->mi_ntargets - 1; if ( i < 0 ) { - if ( strcasecmp( argv[0], "rewriteEngine" ) == 0 ) { - li->rwinfo = rewrite_info_init( REWRITE_MODE_USE_DEFAULT ); - } - return rewrite_parse( li->rwinfo, fname, lineno, - argc, argv ); + fprintf( stderr, "%s: line %d: \"rewrite\" " + "statement outside target definition.\n", + fname, lineno ); + return 1; } - return rewrite_parse( li->targets[ i ]->mt_rwmap.rwm_rw, + return rewrite_parse( mi->mi_targets[ i ].mt_rwmap.rwm_rw, fname, lineno, argc, argv ); /* objectclass/attribute mapping */ } else if ( strcasecmp( argv[ 0 ], "map" ) == 0 ) { - int i = li->ntargets-1; + int i = mi->mi_ntargets - 1; if ( i < 0 ) { fprintf( stderr, @@ -568,9 +652,46 @@ meta_back_db_config( return 1; } - return ldap_back_map_config( &li->targets[ i ]->mt_rwmap.rwm_oc, - &li->targets[ i ]->mt_rwmap.rwm_at, + return ldap_back_map_config( &mi->mi_targets[ i ].mt_rwmap.rwm_oc, + &mi->mi_targets[ i ].mt_rwmap.rwm_at, fname, lineno, argc, argv ); + + } else if ( strcasecmp( argv[ 0 ], "nretries" ) == 0 ) { + int i = mi->mi_ntargets - 1; + int nretries = META_RETRY_UNDEFINED; + + if ( argc != 2 ) { + fprintf( stderr, + "%s: line %d: need value in \"nretries \"\n", + fname, lineno ); + return 1; + } + + if ( strcasecmp( argv[ 1 ], "forever" ) == 0 ) { + nretries = META_RETRY_FOREVER; + + } else if ( strcasecmp( argv[ 1 ], "never" ) == 0 ) { + nretries = META_RETRY_NEVER; + + } else { + char *next; + + nretries = strtol( argv[ 1 ], &next, 10 ); + if ( next == argv[ 1 ] || next[ 0 ] != '\0' ) { + fprintf( stderr, + "%s: line %d: unable to parse value \"%s\" in \"nretries \"\n", + fname, lineno, argv[ 1 ] ); + return 1; + } + } + + if ( i < 0 ) { + mi->mi_nretries = nretries; + + } else { + mi->mi_targets[ i ].mt_nretries = nretries; + } + /* anything else */ } else { return SLAP_CONF_UNKNOWN; @@ -599,11 +720,11 @@ ldap_back_map_config( return 1; } - if ( strcasecmp( argv[1], "objectclass" ) == 0 ) { + if ( strcasecmp( argv[ 1 ], "objectclass" ) == 0 ) { map = oc_map; is_oc = 1; - } else if ( strcasecmp( argv[1], "attribute" ) == 0 ) { + } else if ( strcasecmp( argv[ 1 ], "attribute" ) == 0 ) { map = at_map; } else { @@ -614,20 +735,20 @@ ldap_back_map_config( return 1; } - if ( strcmp( argv[2], "*" ) == 0 ) { - if ( argc < 4 || strcmp( argv[3], "*" ) == 0 ) { + if ( strcmp( argv[ 2 ], "*" ) == 0 ) { + if ( argc < 4 || strcmp( argv[ 3 ], "*" ) == 0 ) { map->drop_missing = ( argc < 4 ); return 0; } - src = dst = argv[3]; + src = dst = argv[ 3 ]; } else if ( argc < 4 ) { src = ""; - dst = argv[2]; + dst = argv[ 2 ]; } else { - src = argv[2]; - dst = ( strcmp( argv[3], "*" ) == 0 ? src : argv[3] ); + src = argv[ 2 ]; + dst = ( strcmp( argv[ 3 ], "*" ) == 0 ? src : argv[ 3 ] ); } if ( ( map == at_map ) @@ -649,14 +770,14 @@ ldap_back_map_config( } ber_str2bv( src, 0, 1, &mapping->src ); ber_str2bv( dst, 0, 1, &mapping->dst ); - mapping[1].src = mapping->dst; - mapping[1].dst = mapping->src; + mapping[ 1 ].src = mapping->dst; + mapping[ 1 ].dst = mapping->src; /* * schema check */ if ( is_oc ) { - if ( src[0] != '\0' ) { + if ( src[ 0 ] != '\0' ) { if ( oc_bvfind( &mapping->src ) == NULL ) { fprintf( stderr, "%s: line %d: warning, source objectClass '%s' " @@ -681,7 +802,7 @@ ldap_back_map_config( const char *text = NULL; AttributeDescription *ad = NULL; - if ( src[0] != '\0' ) { + if ( src[ 0 ] != '\0' ) { rc = slap_bv2ad( &mapping->src, &ad, &text ); if ( rc != LDAP_SUCCESS ) { fprintf( stderr, @@ -707,20 +828,20 @@ ldap_back_map_config( } } - if ( (src[0] != '\0' && avl_find( map->map, (caddr_t)mapping, mapping_cmp ) != NULL) - || avl_find( map->remap, (caddr_t)&mapping[1], mapping_cmp ) != NULL) + if ( (src[ 0 ] != '\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", + "%s: line %d: duplicate mapping found" SLAPD_CONF_UNKNOWN_IGNORED ".\n", fname, lineno ); goto error_return; } - if ( src[0] != '\0' ) { + if ( src[ 0 ] != '\0' ) { avl_insert( &map->map, (caddr_t)mapping, mapping_cmp, mapping_dup ); } - avl_insert( &map->remap, (caddr_t)&mapping[1], + avl_insert( &map->remap, (caddr_t)&mapping[ 1 ], mapping_cmp, mapping_dup ); return 0; @@ -749,9 +870,12 @@ suffix_massage_regexize( const char *s ) p = r + 1, i++ ) ; - res = ch_calloc( sizeof( char ), strlen( s ) + 4 + 4*i + 1 ); + res = ch_calloc( sizeof( char ), + strlen( s ) + + STRLENOF( "(.+,)?" ) + + STRLENOF( "[ ]?" ) * i + 1 ); - ptr = lutil_strcopy( res, "(.*)" ); + ptr = lutil_strcopy( res, "(.+,)?" ); for ( i = 0, p = s; ( r = strchr( p, ',' ) ) != NULL; p = r + 1 , i++ ) { @@ -775,13 +899,13 @@ suffix_massage_patternize( const char *s ) len = strlen( s ); - res = ch_calloc( sizeof( char ), len + sizeof( "%1" ) ); + res = ch_calloc( sizeof( char ), len + STRLENOF( "%1" ) + 1 ); if ( res == NULL ) { return NULL; } strcpy( res, "%1" ); - strcpy( res + sizeof( "%1" ) - 1, s ); + strcpy( &res[ STRLENOF( "%1" ) ], s ); return res; }