From 0fd295a32166e44c186a503ac43277c08a80c5fa Mon Sep 17 00:00:00 2001 From: Pierangelo Masarati Date: Wed, 23 Nov 2005 17:29:16 +0000 Subject: [PATCH] first round of number/time parsing fixes --- servers/slapd/back-meta/config.c | 336 ++++++++++++++++--------------- servers/slapd/main.c | 7 +- servers/slapd/slapcommon.c | 26 ++- servers/slapd/syncrepl.c | 304 +++++++++++++++++----------- 4 files changed, 390 insertions(+), 283 deletions(-) diff --git a/servers/slapd/back-meta/config.c b/servers/slapd/back-meta/config.c index e733fa7eb5..41b9adfabe 100644 --- a/servers/slapd/back-meta/config.c +++ b/servers/slapd/back-meta/config.c @@ -95,12 +95,7 @@ meta_back_db_config( { metainfo_t *mi = ( metainfo_t * )be->be_private; - if ( mi == NULL ) { - fprintf( stderr, - "%s: line %d: meta backend info is null!\n", - fname, lineno ); - return 1; - } + assert( mi != NULL ); /* URI of server to query */ if ( strcasecmp( argv[ 0 ], "uri" ) == 0 ) { @@ -115,27 +110,27 @@ meta_back_db_config( switch ( argc ) { case 1: - fprintf( stderr, + Debug( LDAP_DEBUG_ANY, "%s: line %d: missing URI " "in \"uri ://[:port]/\" line\n", - fname, lineno ); + fname, lineno, 0 ); return 1; case 2: break; default: - fprintf( stderr, + Debug( LDAP_DEBUG_ANY, "%s: line %d: too many args " "in \"uri ://[:port]/\" line\n", - fname, lineno ); + fname, lineno, 0 ); return 1; } if ( be->be_nsuffix == NULL ) { - fprintf( stderr, + Debug( LDAP_DEBUG_ANY, "%s: line %d: the suffix must be defined before any target.\n", - fname, lineno ); + fname, lineno, 0 ); return 1; } @@ -144,18 +139,18 @@ meta_back_db_config( mi->mi_targets = ( metatarget_t * )ch_realloc( mi->mi_targets, sizeof( metatarget_t ) * mi->mi_ntargets ); if ( mi->mi_targets == NULL ) { - fprintf( stderr, + Debug( LDAP_DEBUG_ANY, "%s: line %d: out of memory while storing server name" " in \"uri ://[:port]/\" line\n", - fname, lineno ); + fname, lineno, 0 ); return 1; } if ( new_target( &mi->mi_targets[ i ] ) != 0 ) { - fprintf( stderr, + Debug( LDAP_DEBUG_ANY, "%s: line %d: unable to init server" " in \"uri ://[:port]/\" line\n", - fname, lineno ); + fname, lineno, 0 ); return 1; } @@ -171,10 +166,10 @@ meta_back_db_config( * uri MUST be legal! */ if ( ldap_url_parselist_ext( &ludp, argv[ 1 ], "\t" ) != LDAP_SUCCESS ) { - fprintf( stderr, + Debug( LDAP_DEBUG_ANY, "%s: line %d: unable to parse URI" " in \"uri ://[:port]/\" line\n", - fname, lineno ); + fname, lineno, 0 ); return 1; } @@ -182,10 +177,10 @@ meta_back_db_config( * uri MUST have the part! */ if ( ludp->lud_dn == NULL ) { - fprintf( stderr, + Debug( LDAP_DEBUG_ANY, "%s: line %d: missing " " in \"uri ://[:port]/\" line\n", - fname, lineno ); + fname, lineno, 0 ); return 1; } else if ( ludp->lud_dn[ 0 ] == '\0' ) { @@ -198,10 +193,10 @@ meta_back_db_config( } if ( BER_BVISNULL( &be->be_nsuffix[ j ] ) ) { - fprintf( stderr, + Debug( LDAP_DEBUG_ANY, "%s: line %d: missing " " in \"uri ://[:port]/\" line\n", - fname, lineno ); + fname, lineno, 0 ); return 1; } } @@ -213,9 +208,9 @@ meta_back_db_config( 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", - fname, lineno, argv[ 1 ] ); + Debug( LDAP_DEBUG_ANY, "%s: line %d: " + "target \"%s\" DN is invalid\n", + fname, lineno, argv[ 1 ] ); return( 1 ); } @@ -234,19 +229,19 @@ meta_back_db_config( break; default: - fprintf( stderr, "%s: line %d: " - "invalid scope for target '%s'\n", - fname, lineno, argv[ 1 ] ); + Debug( LDAP_DEBUG_ANY, "%s: line %d: " + "invalid scope for target \"%s\"\n", + fname, lineno, argv[ 1 ] ); return( 1 ); } /* check all, to apply the scope check on the first one */ for ( tmpludp = ludp; 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 ); + Debug( LDAP_DEBUG_ANY, "%s: line %d: " + "multiple URIs must have " + "no DN part\n", + fname, lineno, 0 ); return( 1 ); } @@ -255,8 +250,8 @@ meta_back_db_config( mi->mi_targets[ i ].mt_uri = ldap_url_list2urls( ludp ); ldap_free_urllist( ludp ); if ( mi->mi_targets[ i ].mt_uri == NULL) { - fprintf( stderr, "%s: line %d: no memory?\n", - fname, lineno ); + Debug( LDAP_DEBUG_ANY, "%s: line %d: no memory?\n", + fname, lineno, 0 ); return( 1 ); } @@ -265,10 +260,10 @@ meta_back_db_config( */ #if 0 /* too strict a constraint */ if ( select_backend( &mi->mi_targets[ i ].suffix, 0, 0 ) != be ) { - fprintf( stderr, + Debug( LDAP_DEBUG_ANY, "%s: line %d: of URI does not refer to current backend" " in \"uri ://[:port]/\" line\n", - fname, lineno ); + fname, lineno, 0 ); return 1; } #else @@ -276,10 +271,10 @@ meta_back_db_config( * uri MUST be a branch of a suffix! */ if ( select_backend( &mi->mi_targets[ i ].mt_nsuffix, 0, 0 ) == NULL ) { - fprintf( stderr, + Debug( LDAP_DEBUG_ANY, "%s: line %d: of URI does not resolve to a backend" " in \"uri ://[:port]/\" line\n", - fname, lineno ); + fname, lineno, 0 ); return 1; } #endif @@ -290,70 +285,86 @@ meta_back_db_config( if ( argc == 1 ) { if ( i < 0 ) { - fprintf( stderr, + Debug( LDAP_DEBUG_ANY, "%s: line %d: \"default-target\" alone need be" " inside a \"uri\" directive\n", - fname, lineno ); + fname, lineno, 0 ); return 1; } mi->mi_defaulttarget = i; + } else { if ( strcasecmp( argv[ 1 ], "none" ) == 0 ) { if ( i >= 0 ) { - fprintf( stderr, + Debug( LDAP_DEBUG_ANY, "%s: line %d: \"default-target none\"" " should go before uri definitions\n", - fname, lineno ); + fname, lineno, 0 ); } mi->mi_defaulttarget = META_DEFAULT_TARGET_NONE; } else { - char *next; - int n = strtol( argv[ 1 ], &next, 10 ); - if ( n < 0 || n >= i - 1 ) { - fprintf( stderr, + + if ( lutil_atoi( &mi->mi_defaulttarget, argv[ 1 ] ) != 0 + || mi->mi_defaulttarget < 0 + || mi->mi_defaulttarget >= i - 1 ) + { + Debug( LDAP_DEBUG_ANY, "%s: line %d: illegal target number %d\n", - fname, lineno, n ); + fname, lineno, mi->mi_defaulttarget ); return 1; } - mi->mi_defaulttarget = n; } } /* ttl of dn cache */ } else if ( strcasecmp( argv[ 0 ], "dncache-ttl" ) == 0 ) { if ( argc != 2 ) { - fprintf( stderr, + Debug( LDAP_DEBUG_ANY, "%s: line %d: missing ttl in \"dncache-ttl \" line\n", - fname, lineno ); + fname, lineno, 0 ); return 1; } if ( strcasecmp( argv[ 1 ], "forever" ) == 0 ) { mi->mi_cache.ttl = META_DNCACHE_FOREVER; + } else if ( strcasecmp( argv[ 1 ], "disabled" ) == 0 ) { mi->mi_cache.ttl = META_DNCACHE_DISABLED; + } else { - char *next; + unsigned long t; - mi->mi_cache.ttl = strtol( argv[ 1 ], &next, 10 ); - if ( next == argv[ 1 ] || next[ 0 ] != '\0' ) { - fprintf( stderr, + if ( lutil_parse_time( argv[ 1 ], &t ) != 0 ) { + Debug( LDAP_DEBUG_ANY, "%s: line %d: unable to parse ttl \"%s\" in \"dncache-ttl \" line\n", fname, lineno, argv[ 1 ] ); return 1; } + mi->mi_cache.ttl = (time_t)t; } /* network timeout when connecting to ldap servers */ } else if ( strcasecmp( argv[ 0 ], "network-timeout" ) == 0 ) { if ( argc != 2 ) { - fprintf( stderr, + Debug( LDAP_DEBUG_ANY, "%s: line %d: missing network timeout in \"network-timeout \" line\n", - fname, lineno ); + fname, lineno, 0 ); + return 1; + } + + if ( lutil_atoi( &mi->mi_network_timeout, argv[ 1 ] ) ) { + Debug( LDAP_DEBUG_ANY, + "%s: line %d: unable to parse timeout \"%s\" in \"network-timeout \" line\n", + fname, lineno, argv[ 1 ] ); + return 1; + + } else if ( mi->mi_network_timeout < 0 ) { + Debug( LDAP_DEBUG_ANY, + "%s: line %d: ilegal negative timeout in \"network-timeout \" line\n", + fname, lineno, argv[ 1 ] ); return 1; } - mi->mi_network_timeout = atol(argv[ 1 ]); /* name to use for meta_back_group */ } else if ( strcasecmp( argv[ 0 ], "acl-authcDN" ) == 0 @@ -363,24 +374,24 @@ meta_back_db_config( struct berval dn; if ( i < 0 ) { - fprintf( stderr, + Debug( LDAP_DEBUG_ANY, "%s: line %d: need \"uri\" directive first\n", - fname, lineno ); + fname, lineno, 0 ); return 1; } if ( argc != 2 ) { - fprintf( stderr, + Debug( LDAP_DEBUG_ANY, "%s: line %d: missing name in \"binddn \" line\n", - fname, lineno ); + fname, lineno, 0 ); return 1; } if ( strcasecmp( argv[ 0 ], "binddn" ) == 0 ) { - fprintf( stderr, "%s: line %d: " + Debug( LDAP_DEBUG_ANY, "%s: line %d: " "\"binddn\" statement is deprecated; " "use \"acl-authcDN\" instead\n", - fname, lineno ); + fname, lineno, 0 ); /* FIXME: some day we'll need to throw an error */ } @@ -389,7 +400,7 @@ meta_back_db_config( if ( dnNormalize( 0, NULL, NULL, &dn, &mi->mi_targets[ i ].mt_binddn, NULL ) != LDAP_SUCCESS ) { - fprintf( stderr, "%s: line %d: " + Debug( LDAP_DEBUG_ANY, "%s: line %d: " "bind DN '%s' is invalid\n", fname, lineno, argv[ 1 ] ); return( 1 ); @@ -402,24 +413,24 @@ meta_back_db_config( int i = mi->mi_ntargets - 1; if ( i < 0 ) { - fprintf( stderr, + Debug( LDAP_DEBUG_ANY, "%s: line %d: need \"uri\" directive first\n", - fname, lineno ); + fname, lineno, 0 ); return 1; } if ( argc != 2 ) { - fprintf( stderr, + Debug( LDAP_DEBUG_ANY, "%s: line %d: missing password in \"bindpw \" line\n", - fname, lineno ); + fname, lineno, 0 ); return 1; } if ( strcasecmp( argv[ 0 ], "bindpw" ) == 0 ) { - fprintf( stderr, "%s: line %d: " + Debug( LDAP_DEBUG_ANY, "%s: line %d: " "\"bindpw\" statement is deprecated; " "use \"acl-passwd\" instead\n", - fname, lineno ); + fname, lineno, 0 ); /* FIXME: some day we'll need to throw an error */ } @@ -428,16 +439,16 @@ meta_back_db_config( /* save bind creds for referral rebinds? */ } else if ( strcasecmp( argv[ 0 ], "rebind-as-user" ) == 0 ) { if ( argc > 2 ) { - fprintf( stderr, + Debug( LDAP_DEBUG_ANY, "%s: line %d: \"rebind-as-user {NO|yes}\" takes 1 argument.\n", - fname, lineno ); + fname, lineno, 0 ); return( 1 ); } if ( argc == 1 ) { - fprintf( stderr, + Debug( LDAP_DEBUG_ANY, "%s: line %d: deprecated use of \"rebind-as-user {FALSE|true}\" with no arguments.\n", - fname, lineno ); + fname, lineno, 0 ); mi->mi_flags |= LDAP_BACK_F_SAVECRED; } else { @@ -451,7 +462,7 @@ meta_back_db_config( break; default: - fprintf( stderr, + Debug( LDAP_DEBUG_ANY, "%s: line %d: \"rebind-as-user {FALSE|true}\" unknown argument \"%s\".\n", fname, lineno, argv[ 1 ] ); return 1; @@ -464,9 +475,9 @@ meta_back_db_config( : &mi->mi_flags; if ( argc != 2 ) { - fprintf( stderr, + Debug( LDAP_DEBUG_ANY, "%s: line %d: \"chase-referrals {TRUE|false}\" needs 1 argument.\n", - fname, lineno ); + fname, lineno, 0 ); return( 1 ); } @@ -481,9 +492,9 @@ meta_back_db_config( break; default: - fprintf( stderr, + Debug( LDAP_DEBUG_ANY, "%s: line %d: \"chase-referrals {TRUE|false}\": unknown argument \"%s\".\n", - fname, lineno, argv[ 1 ] ); + fname, lineno, argv[ 1 ] ); return( 1 ); } @@ -493,9 +504,9 @@ meta_back_db_config( : &mi->mi_flags; if ( argc != 2 ) { - fprintf( stderr, + Debug( LDAP_DEBUG_ANY, "%s: line %d: \"tls \" needs 1 argument.\n", - fname, lineno ); + fname, lineno, 0 ); return( 1 ); } @@ -518,9 +529,9 @@ meta_back_db_config( *flagsp |= LDAP_BACK_F_PROPAGATE_TLS; } else { - fprintf( stderr, + Debug( LDAP_DEBUG_ANY, "%s: line %d: \"tls \": unknown argument \"%s\".\n", - fname, lineno, argv[ 1 ] ); + fname, lineno, argv[ 1 ] ); return( 1 ); } @@ -530,9 +541,9 @@ meta_back_db_config( : &mi->mi_flags; if ( argc != 2 ) { - fprintf( stderr, + Debug( LDAP_DEBUG_ANY, "%s: line %d: \"t-f-support {FALSE|true|discover}\" needs 1 argument.\n", - fname, lineno ); + fname, lineno, 0 ); return( 1 ); } @@ -550,7 +561,7 @@ meta_back_db_config( *flagsp |= LDAP_BACK_F_SUPPORT_T_F_DISCOVER; } else { - fprintf( stderr, + Debug( LDAP_DEBUG_ANY, "%s: line %d: unknown value \"%s\" for \"t-f-support {no|yes|discover}\".\n", fname, lineno, argv[ 1 ] ); return 1; @@ -561,9 +572,9 @@ meta_back_db_config( /* onerr? */ } else if ( strcasecmp( argv[ 0 ], "onerr" ) == 0 ) { if ( argc != 2 ) { - fprintf( stderr, + Debug( LDAP_DEBUG_ANY, "%s: line %d: \"onerr {CONTINUE|stop}\" takes 1 argument\n", - fname, lineno ); + fname, lineno, 0 ); return( 1 ); } @@ -574,7 +585,7 @@ meta_back_db_config( mi->mi_flags |= META_BACK_F_ONERR_STOP; } else { - fprintf( stderr, + Debug( LDAP_DEBUG_ANY, "%s: line %d: \"onerr {CONTINUE|stop}\": invalid arg \"%s\".\n", fname, lineno, argv[ 1 ] ); return 1; @@ -583,9 +594,9 @@ meta_back_db_config( /* bind-defer? */ } else if ( strcasecmp( argv[ 0 ], "pseudoroot-bind-defer" ) == 0 ) { if ( argc != 2 ) { - fprintf( stderr, + Debug( LDAP_DEBUG_ANY, "%s: line %d: \"pseudoroot-bind-defer {FALSE|true}\" takes 1 argument\n", - fname, lineno ); + fname, lineno, 0 ); return( 1 ); } @@ -599,28 +610,29 @@ meta_back_db_config( break; default: - fprintf( stderr, + Debug( LDAP_DEBUG_ANY, "%s: line %d: \"pseudoroot-bind-defer {FALSE|true}\": invalid arg \"%s\".\n", fname, lineno, argv[ 1 ] ); return 1; } } else if ( strcasecmp( argv[ 0 ], "timeout" ) == 0 ) { - char *sep, *next; + char *sep; time_t *tv = mi->mi_ntargets ? mi->mi_targets[ mi->mi_ntargets - 1 ].mt_timeout : mi->mi_timeout; int c; if ( argc < 2 ) { - fprintf( stderr, + Debug( LDAP_DEBUG_ANY, "%s: line %d: \"timeout [{add|delete|modify|modrdn}=] [...]\" takes at least 1 argument\n", - fname, lineno ); + fname, lineno, 0 ); return( 1 ); } for ( c = 1; c < argc; c++ ) { - time_t *t = NULL, val; + time_t *t = NULL; + unsigned long val; sep = strchr( argv[ c ], '=' ); if ( sep != NULL ) { @@ -635,9 +647,13 @@ meta_back_db_config( } else if ( strncasecmp( argv[ c ], "modrdn", len ) == 0 ) { t = &tv[ LDAP_BACK_OP_MODRDN ]; } else { - fprintf( stderr, - "%s: line %d: unknown operation \"%s\" for timeout #%d.\n", - fname, lineno, argv[ c ], c ); + char buf[ SLAP_TEXT_BUFLEN ]; + snprintf( buf, sizeof( buf ), + "unknown operation \"%s\" for timeout #%d", + argv[ c ], c ); + Debug( LDAP_DEBUG_ANY, + "%s: line %d: %s.\n", + fname, lineno, buf ); return 1; } sep++; @@ -646,22 +662,21 @@ meta_back_db_config( sep = argv[ c ]; } - val = strtoul( sep, &next, 10 ); - if ( next == sep || next[ 0 ] != '\0' ) { - fprintf( stderr, + if ( lutil_parse_time( sep, &val ) != 0 ) { + Debug( LDAP_DEBUG_ANY, "%s: line %d: unable to parse value \"%s\" for timeout.\n", fname, lineno, sep ); return 1; } if ( t ) { - *t = val; + *t = (time_t)val; } else { int i; for ( i = 0; i < LDAP_BACK_OP_LAST; i++ ) { - tv[ i ] = val; + tv[ i ] = (time_t)val; } } } @@ -672,16 +687,16 @@ meta_back_db_config( struct berval dn; if ( i < 0 ) { - fprintf( stderr, + Debug( LDAP_DEBUG_ANY, "%s: line %d: need \"uri\" directive first\n", - fname, lineno ); + fname, lineno, 0 ); return 1; } if ( argc != 2 ) { - fprintf( stderr, + Debug( LDAP_DEBUG_ANY, "%s: line %d: missing name in \"pseudorootdn \" line\n", - fname, lineno ); + fname, lineno, 0 ); return 1; } @@ -690,7 +705,7 @@ meta_back_db_config( if ( dnNormalize( 0, NULL, NULL, &dn, &mi->mi_targets[ i ].mt_pseudorootdn, NULL ) != LDAP_SUCCESS ) { - fprintf( stderr, "%s: line %d: " + Debug( LDAP_DEBUG_ANY, "%s: line %d: " "pseudoroot DN '%s' is invalid\n", fname, lineno, argv[ 1 ] ); return( 1 ); @@ -701,16 +716,16 @@ meta_back_db_config( int i = mi->mi_ntargets - 1; if ( i < 0 ) { - fprintf( stderr, + Debug( LDAP_DEBUG_ANY, "%s: line %d: need \"uri\" directive first\n", - fname, lineno ); + fname, lineno, 0 ); return 1; } if ( argc != 2 ) { - fprintf( stderr, + Debug( LDAP_DEBUG_ANY, "%s: line %d: missing password in \"pseudorootpw \" line\n", - fname, lineno ); + fname, lineno, 0 ); return 1; } ber_str2bv( argv[ 1 ], 0L, 1, &mi->mi_targets[ i ].mt_pseudorootpw ); @@ -722,9 +737,9 @@ meta_back_db_config( struct berval dn, nvnc, pvnc, nrnc, prnc; if ( i < 0 ) { - fprintf( stderr, + Debug( LDAP_DEBUG_ANY, "%s: line %d: need \"uri\" directive first\n", - fname, lineno ); + fname, lineno, 0 ); return 1; } @@ -740,15 +755,15 @@ meta_back_db_config( * current server */ if ( argc != 3 ) { - fprintf( stderr, + Debug( LDAP_DEBUG_ANY, "%s: line %d: syntax is \"suffixMassage \"\n", - fname, lineno ); + fname, lineno, 0 ); return 1; } ber_str2bv( argv[ 1 ], 0, 0, &dn ); if ( dnPrettyNormal( NULL, &dn, &pvnc, &nvnc, NULL ) != LDAP_SUCCESS ) { - fprintf( stderr, "%s: line %d: " + Debug( LDAP_DEBUG_ANY, "%s: line %d: " "suffix '%s' is invalid\n", fname, lineno, argv[ 1 ] ); return 1; @@ -756,10 +771,10 @@ meta_back_db_config( tmp_be = select_backend( &nvnc, 0, 0 ); if ( tmp_be != NULL && tmp_be != be ) { - fprintf( stderr, + Debug( LDAP_DEBUG_ANY, "%s: line %d: suffix already in use by another backend in" " \"suffixMassage \"\n", - fname, lineno ); + fname, lineno, 0 ); free( pvnc.bv_val ); free( nvnc.bv_val ); return 1; @@ -767,9 +782,9 @@ meta_back_db_config( ber_str2bv( argv[ 2 ], 0, 0, &dn ); if ( dnPrettyNormal( NULL, &dn, &prnc, &nrnc, NULL ) != LDAP_SUCCESS ) { - fprintf( stderr, "%s: line %d: " - "massaged suffix '%s' is invalid\n", - fname, lineno, argv[ 2 ] ); + Debug( LDAP_DEBUG_ANY, "%s: line %d: " + "massaged suffix '%s' is invalid\n", + fname, lineno, argv[ 2 ] ); free( pvnc.bv_val ); free( nvnc.bv_val ); return 1; @@ -778,10 +793,10 @@ meta_back_db_config( #if 0 tmp_be = select_backend( &nrnc, 0, 0 ); if ( tmp_be != NULL ) { - fprintf( stderr, + Debug( LDAP_DEBUG_ANY, "%s: line %d: massaged suffix already in use by another backend in" " \"suffixMassage \"\n", - fname, lineno ); + fname, lineno, 0 ); free( pvnc.bv_val ); free( nvnc.bv_val ); free( prnc.bv_val ); @@ -811,9 +826,9 @@ meta_back_db_config( int i = mi->mi_ntargets - 1; if ( i < 0 ) { - fprintf( stderr, "%s: line %d: \"rewrite\" " + Debug( LDAP_DEBUG_ANY, "%s: line %d: \"rewrite\" " "statement outside target definition.\n", - fname, lineno ); + fname, lineno, 0 ); return 1; } @@ -825,9 +840,9 @@ meta_back_db_config( int i = mi->mi_ntargets - 1; if ( i < 0 ) { - fprintf( stderr, + Debug( LDAP_DEBUG_ANY, "%s: line %d: need \"uri\" directive first\n", - fname, lineno ); + fname, lineno, 0 ); return 1; } @@ -840,9 +855,9 @@ meta_back_db_config( int nretries = META_RETRY_UNDEFINED; if ( argc != 2 ) { - fprintf( stderr, + Debug( LDAP_DEBUG_ANY, "%s: line %d: need value in \"nretries \"\n", - fname, lineno ); + fname, lineno, 0 ); return 1; } @@ -853,11 +868,8 @@ meta_back_db_config( nretries = META_RETRY_NEVER; } else { - char *next; - - nretries = strtol( argv[ 1 ], &next, 10 ); - if ( next == argv[ 1 ] || next[ 0 ] != '\0' ) { - fprintf( stderr, + if ( lutil_atoi( &nretries, argv[ 1 ] ) != 0 ) { + Debug( LDAP_DEBUG_ANY, "%s: line %d: unable to parse value \"%s\" in \"nretries \"\n", fname, lineno, argv[ 1 ] ); return 1; @@ -893,9 +905,9 @@ ldap_back_map_config( int is_oc = 0; if ( argc < 3 || argc > 4 ) { - fprintf( stderr, + Debug( LDAP_DEBUG_ANY, "%s: line %d: syntax is \"map {objectclass | attribute} [ | *] { | *}\"\n", - fname, lineno ); + fname, lineno, 0 ); return 1; } @@ -907,10 +919,10 @@ ldap_back_map_config( map = at_map; } else { - fprintf( stderr, "%s: line %d: syntax is " + Debug( LDAP_DEBUG_ANY, "%s: line %d: syntax is " "\"map {objectclass | attribute} [ | *] " "{ | *}\"\n", - fname, lineno ); + fname, lineno, 0 ); return 1; } @@ -934,17 +946,17 @@ ldap_back_map_config( && ( strcasecmp( src, "objectclass" ) == 0 || strcasecmp( dst, "objectclass" ) == 0 ) ) { - fprintf( stderr, + Debug( LDAP_DEBUG_ANY, "%s: line %d: objectclass attribute cannot be mapped\n", - fname, lineno ); + fname, lineno, 0 ); } mapping = (struct ldapmapping *)ch_calloc( 2, sizeof(struct ldapmapping) ); if ( mapping == NULL ) { - fprintf( stderr, + Debug( LDAP_DEBUG_ANY, "%s: line %d: out of memory\n", - fname, lineno ); + fname, lineno, 0 ); return 1; } ber_str2bv( src, 0, 1, &mapping[ 0 ].src ); @@ -958,7 +970,7 @@ ldap_back_map_config( if ( is_oc ) { if ( src[ 0 ] != '\0' ) { if ( oc_bvfind( &mapping[ 0 ].src ) == NULL ) { - fprintf( stderr, + Debug( LDAP_DEBUG_ANY, "%s: line %d: warning, source objectClass '%s' " "should be defined in schema\n", fname, lineno, src ); @@ -971,7 +983,7 @@ ldap_back_map_config( } if ( oc_bvfind( &mapping[ 0 ].dst ) == NULL ) { - fprintf( stderr, + Debug( LDAP_DEBUG_ANY, "%s: line %d: warning, destination objectClass '%s' " "is not defined in schema\n", fname, lineno, dst ); @@ -984,7 +996,7 @@ ldap_back_map_config( if ( src[ 0 ] != '\0' ) { rc = slap_bv2ad( &mapping[ 0 ].src, &ad, &text ); if ( rc != LDAP_SUCCESS ) { - fprintf( stderr, + Debug( LDAP_DEBUG_ANY, "%s: line %d: warning, source attributeType '%s' " "should be defined in schema\n", fname, lineno, src ); @@ -1000,10 +1012,14 @@ ldap_back_map_config( rc = slap_bv2undef_ad( &mapping[ 0 ].src, &ad, &text, SLAP_AD_PROXIED ); if ( rc != LDAP_SUCCESS ) { - fprintf( stderr, - "%s: line %d: source attributeType '%s': %d (%s)\n", - fname, lineno, src, - rc, text ? text : "" ); + char buf[ SLAP_TEXT_BUFLEN ]; + + snprintf( buf, sizeof( buf ), + "source attributeType \"%s\": %d (%s)", + src, rc, text ? text : "" ); + Debug( LDAP_DEBUG_ANY, + "%s: line %d: %s\n", + fname, lineno, buf ); goto error_return; } } @@ -1013,7 +1029,7 @@ ldap_back_map_config( rc = slap_bv2ad( &mapping[ 0 ].dst, &ad, &text ); if ( rc != LDAP_SUCCESS ) { - fprintf( stderr, + Debug( LDAP_DEBUG_ANY, "%s: line %d: warning, destination attributeType '%s' " "is not defined in schema\n", fname, lineno, dst ); @@ -1026,10 +1042,14 @@ ldap_back_map_config( rc = slap_bv2undef_ad( &mapping[ 0 ].dst, &ad, &text, SLAP_AD_PROXIED ); if ( rc != LDAP_SUCCESS ) { - fprintf( stderr, - "%s: line %d: source attributeType '%s': %d (%s)\n", - fname, lineno, dst, - rc, text ? text : "" ); + char buf[ SLAP_TEXT_BUFLEN ]; + + snprintf( buf, sizeof( buf ), + "source attributeType \"%s\": %d (%s)\n", + dst, rc, text ? text : "" ); + Debug( LDAP_DEBUG_ANY, + "%s: line %d: %s\n", + fname, lineno, buf ); return 1; } } @@ -1038,9 +1058,9 @@ ldap_back_map_config( if ( (src[ 0 ] != '\0' && avl_find( map->map, (caddr_t)&mapping[ 0 ], mapping_cmp ) != NULL) || avl_find( map->remap, (caddr_t)&mapping[ 1 ], mapping_cmp ) != NULL) { - fprintf( stderr, + Debug( LDAP_DEBUG_ANY, "%s: line %d: duplicate mapping found" SLAPD_CONF_UNKNOWN_IGNORED ".\n", - fname, lineno ); + fname, lineno, 0 ); goto error_return; } diff --git a/servers/slapd/main.c b/servers/slapd/main.c index f74bc4f231..fa88c285ee 100644 --- a/servers/slapd/main.c +++ b/servers/slapd/main.c @@ -418,7 +418,7 @@ int main( int argc, char **argv ) slap_debug |= level; } #else - if ( atoi( optarg ) != 0 ) + if ( lutil_atoi( &level, optarg ) != 0 || level != 0 ) fputs( "must compile with LDAP_DEBUG for debugging\n", stderr ); #endif @@ -467,7 +467,10 @@ int main( int argc, char **argv ) } case 's': /* set syslog level */ - ldap_syslog = atoi( optarg ); + if ( lutil_atoi( &ldap_syslog, optarg ) != 0 ) { + fprintf( stderr, "unable to parse syslog level \"%s\"", optarg ); + goto destroy; + } break; #ifdef LOG_LOCAL4 diff --git a/servers/slapd/slapcommon.c b/servers/slapd/slapcommon.c index 906d7a6046..5026e41de4 100644 --- a/servers/slapd/slapcommon.c +++ b/servers/slapd/slapcommon.c @@ -133,16 +133,28 @@ parse_slapacl( void ) ber_str2bv( p, 0, 1, &sock_name ); } else if ( strncasecmp( optarg, "ssf", len ) == 0 ) { - ssf = atoi( p ); + if ( lutil_atou( &ssf, p ) ) { + Debug( LDAP_DEBUG_ANY, "unable to parse ssf=\"%s\".\n", p, 0, 0 ); + return -1; + } } else if ( strncasecmp( optarg, "transport_ssf", len ) == 0 ) { - transport_ssf = atoi( p ); + if ( lutil_atou( &transport_ssf, p ) ) { + Debug( LDAP_DEBUG_ANY, "unable to parse transport_ssf=\"%s\".\n", p, 0, 0 ); + return -1; + } } else if ( strncasecmp( optarg, "tls_ssf", len ) == 0 ) { - tls_ssf = atoi( p ); + if ( lutil_atou( &tls_ssf, p ) ) { + Debug( LDAP_DEBUG_ANY, "unable to parse tls_ssf=\"%s\".\n", p, 0, 0 ); + return -1; + } } else if ( strncasecmp( optarg, "sasl_ssf", len ) == 0 ) { - sasl_ssf = atoi( p ); + if ( lutil_atou( &sasl_ssf, p ) ) { + Debug( LDAP_DEBUG_ANY, "unable to parse sasl_ssf=\"%s\".\n", p, 0, 0 ); + return -1; + } } else if ( strncasecmp( optarg, "authzDN", len ) == 0 ) { ber_str2bv( p, 0, 1, &authzDN ); @@ -283,7 +295,7 @@ slap_tool_init( ldap_debug = 0; } #else - if ( atoi( optarg ) != 0 ) + if ( lutil_atoi( &level, optarg ) != 0 || level != 0 ) fputs( "must compile with LDAP_DEBUG for debugging\n", stderr ); #endif @@ -321,7 +333,9 @@ slap_tool_init( break; case 'n': /* which config file db to index */ - dbnum = atoi( optarg ); + if ( lutil_atoi( &dbnum, optarg ) ) { + usage( tool, progname ); + } break; case 'o': diff --git a/servers/slapd/syncrepl.c b/servers/slapd/syncrepl.c index 2d47e804c2..5b263a6030 100644 --- a/servers/slapd/syncrepl.c +++ b/servers/slapd/syncrepl.c @@ -188,7 +188,7 @@ init_syncrepl(syncinfo_t *si) } if ( attrs == NULL ) { - Debug( LDAP_DEBUG_ANY, "out of memory\n", 0,0,0 ); + Debug( LDAP_DEBUG_ANY, "out of memory\n", 0, 0, 0 ); } /* Add Attributes */ @@ -500,7 +500,7 @@ do_syncrep1( #else /* HAVE_CYRUS_SASL */ /* Should never get here, we trapped this at config time */ assert(0); - fprintf( stderr, "not compiled with SASL support\n" ); + Debug( LDAP_DEBUG_SYNC, "not compiled with SASL support\n", 0, 0, 0 ); rc = LDAP_OTHER; goto done; #endif @@ -2701,40 +2701,46 @@ static slap_verbmasks datamodes[] = { static int parse_syncrepl_line( - char **cargv, - int cargc, - syncinfo_t *si -) + ConfigArgs *c, + syncinfo_t *si ) { int gots = 0; int i; char *val; - for ( i = 1; i < cargc; i++ ) { - if ( !strncasecmp( cargv[ i ], IDSTR "=", + for ( i = 1; i < c->argc; i++ ) { + if ( !strncasecmp( c->argv[ i ], IDSTR "=", STRLENOF( IDSTR "=" ) ) ) { int tmp; /* '\0' string terminator accounts for '=' */ - val = cargv[ i ] + STRLENOF( IDSTR "=" ); - tmp= atoi( val ); + val = c->argv[ i ] + STRLENOF( IDSTR "=" ); + if ( lutil_atoi( &tmp, val ) != 0 ) { + snprintf( c->msg, sizeof( c->msg ), + "Error: parse_syncrepl_line: " + "unable to parse syncrepl id \"%s\"", val ); + Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->msg, 0 ); + return -1; + } if ( tmp >= 1000 || tmp < 0 ) { - fprintf( stderr, "Error: parse_syncrepl_line: " - "syncrepl id %d is out of range [0..999]\n", tmp ); + snprintf( c->msg, sizeof( c->msg ), + "Error: parse_syncrepl_line: " + "syncrepl id %d is out of range [0..999]", tmp ); + Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->msg, 0 ); return -1; } si->si_rid = tmp; gots |= GOT_ID; - } else if ( !strncasecmp( cargv[ i ], PROVIDERSTR "=", + } else if ( !strncasecmp( c->argv[ i ], PROVIDERSTR "=", STRLENOF( PROVIDERSTR "=" ) ) ) { - val = cargv[ i ] + STRLENOF( PROVIDERSTR "=" ); + val = c->argv[ i ] + STRLENOF( PROVIDERSTR "=" ); ber_str2bv( val, 0, 1, &si->si_bindconf.sb_uri ); gots |= GOT_PROVIDER; - } else if ( !strncasecmp( cargv[ i ], SCHEMASTR "=", + } else if ( !strncasecmp( c->argv[ i ], SCHEMASTR "=", STRLENOF( SCHEMASTR "=" ) ) ) { - val = cargv[ i ] + STRLENOF( SCHEMASTR "=" ); + val = c->argv[ i ] + STRLENOF( SCHEMASTR "=" ); if ( !strncasecmp( val, "on", STRLENOF( "on" ) )) { si->si_schemachecking = 1; } else if ( !strncasecmp( val, "off", STRLENOF( "off" ) ) ) { @@ -2742,59 +2748,63 @@ parse_syncrepl_line( } else { si->si_schemachecking = 1; } - } else if ( !strncasecmp( cargv[ i ], FILTERSTR "=", + } else if ( !strncasecmp( c->argv[ i ], FILTERSTR "=", STRLENOF( FILTERSTR "=" ) ) ) { - val = cargv[ i ] + STRLENOF( FILTERSTR "=" ); + val = c->argv[ i ] + STRLENOF( FILTERSTR "=" ); if ( si->si_filterstr.bv_val ) ch_free( si->si_filterstr.bv_val ); ber_str2bv( val, 0, 1, &si->si_filterstr ); - } else if ( !strncasecmp( cargv[ i ], LOGFILTERSTR "=", + } else if ( !strncasecmp( c->argv[ i ], LOGFILTERSTR "=", STRLENOF( LOGFILTERSTR "=" ) ) ) { - val = cargv[ i ] + STRLENOF( LOGFILTERSTR "=" ); + val = c->argv[ i ] + STRLENOF( LOGFILTERSTR "=" ); if ( si->si_logfilterstr.bv_val ) ch_free( si->si_logfilterstr.bv_val ); ber_str2bv( val, 0, 1, &si->si_logfilterstr ); - } else if ( !strncasecmp( cargv[ i ], SEARCHBASESTR "=", + } else if ( !strncasecmp( c->argv[ i ], SEARCHBASESTR "=", STRLENOF( SEARCHBASESTR "=" ) ) ) { struct berval bv; int rc; - val = cargv[ i ] + STRLENOF( SEARCHBASESTR "=" ); + val = c->argv[ i ] + STRLENOF( SEARCHBASESTR "=" ); if ( si->si_base.bv_val ) { ch_free( si->si_base.bv_val ); } ber_str2bv( val, 0, 0, &bv ); rc = dnNormalize( 0, NULL, NULL, &bv, &si->si_base, NULL ); if ( rc != LDAP_SUCCESS ) { - fprintf( stderr, "Invalid base DN \"%s\": %d (%s)\n", + snprintf( c->msg, sizeof( c->msg ), + "Invalid base DN \"%s\": %d (%s)", val, rc, ldap_err2string( rc ) ); + Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->msg, 0 ); return -1; } - } else if ( !strncasecmp( cargv[ i ], LOGBASESTR "=", + } else if ( !strncasecmp( c->argv[ i ], LOGBASESTR "=", STRLENOF( LOGBASESTR "=" ) ) ) { struct berval bv; int rc; - val = cargv[ i ] + STRLENOF( LOGBASESTR "=" ); + val = c->argv[ i ] + STRLENOF( LOGBASESTR "=" ); if ( si->si_logbase.bv_val ) { ch_free( si->si_logbase.bv_val ); } ber_str2bv( val, 0, 0, &bv ); rc = dnNormalize( 0, NULL, NULL, &bv, &si->si_logbase, NULL ); if ( rc != LDAP_SUCCESS ) { - fprintf( stderr, "Invalid logbase DN \"%s\": %d (%s)\n", + snprintf( c->msg, sizeof( c->msg ), + "Invalid logbase DN \"%s\": %d (%s)", val, rc, ldap_err2string( rc ) ); + Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->msg, 0 ); return -1; } - } else if ( !strncasecmp( cargv[ i ], SCOPESTR "=", + } else if ( !strncasecmp( c->argv[ i ], SCOPESTR "=", STRLENOF( SCOPESTR "=" ) ) ) { int j; - val = cargv[ i ] + STRLENOF( SCOPESTR "=" ); + val = c->argv[ i ] + STRLENOF( SCOPESTR "=" ); for ( j=0; !BER_BVISNULL(&scopes[j].key); j++ ) { if (!strcasecmp( val, scopes[j].key.bv_val )) { si->si_scope = scopes[j].val; @@ -2802,18 +2812,20 @@ parse_syncrepl_line( } } if ( BER_BVISNULL(&scopes[j].key) ) { - fprintf( stderr, "Error: parse_syncrepl_line: " - "unknown scope \"%s\"\n", val); + snprintf( c->msg, sizeof( c->msg ), + "Error: parse_syncrepl_line: " + "unknown scope \"%s\"", val); + Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->msg, 0 ); return -1; } - } else if ( !strncasecmp( cargv[ i ], ATTRSONLYSTR "=", + } else if ( !strncasecmp( c->argv[ i ], ATTRSONLYSTR "=", STRLENOF( ATTRSONLYSTR "=" ) ) ) { si->si_attrsonly = 1; - } else if ( !strncasecmp( cargv[ i ], ATTRSSTR "=", + } else if ( !strncasecmp( c->argv[ i ], ATTRSSTR "=", STRLENOF( ATTRSSTR "=" ) ) ) { - val = cargv[ i ] + STRLENOF( ATTRSSTR "=" ); + val = c->argv[ i ] + STRLENOF( ATTRSSTR "=" ); if ( !strncasecmp( val, ":include:", STRLENOF(":include:") ) ) { char *attr_fname; attr_fname = ch_strdup( val + STRLENOF(":include:") ); @@ -2846,15 +2858,15 @@ parse_syncrepl_line( return -1; } } - } else if ( !strncasecmp( cargv[ i ], EXATTRSSTR "=", + } else if ( !strncasecmp( c->argv[ i ], EXATTRSSTR "=", STRLENOF( EXATTRSSTR "=" ) ) ) { - val = cargv[ i ] + STRLENOF( EXATTRSSTR "=" ); + val = c->argv[ i ] + STRLENOF( EXATTRSSTR "=" ); if ( !strncasecmp( val, ":include:", STRLENOF(":include:") )) { char *attr_fname; attr_fname = ch_strdup( val + STRLENOF(":include:") ); si->si_exanlist = file2anlist( - si->si_exanlist, attr_fname, " ,\t" ); + si->si_exanlist, attr_fname, " ,\t" ); if ( si->si_exanlist == NULL ) { ch_free( attr_fname ); return -1; @@ -2866,85 +2878,98 @@ parse_syncrepl_line( return -1; } } - } else if ( !strncasecmp( cargv[ i ], TYPESTR "=", + } else if ( !strncasecmp( c->argv[ i ], TYPESTR "=", STRLENOF( TYPESTR "=" ) ) ) { - val = cargv[ i ] + STRLENOF( TYPESTR "=" ); + val = c->argv[ i ] + STRLENOF( TYPESTR "=" ); if ( !strncasecmp( val, "refreshOnly", - STRLENOF("refreshOnly") )) + STRLENOF("refreshOnly") ) ) { si->si_type = si->si_ctype = LDAP_SYNC_REFRESH_ONLY; } else if ( !strncasecmp( val, "refreshAndPersist", - STRLENOF("refreshAndPersist") )) + STRLENOF("refreshAndPersist") ) ) { si->si_type = si->si_ctype = LDAP_SYNC_REFRESH_AND_PERSIST; si->si_interval = 60; } else { - fprintf( stderr, "Error: parse_syncrepl_line: " - "unknown sync type \"%s\"\n", val); + snprintf( c->msg, sizeof( c->msg ), + "Error: parse_syncrepl_line: " + "unknown sync type \"%s\"", val); + Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->msg, 0 ); return -1; } - } else if ( !strncasecmp( cargv[ i ], INTERVALSTR "=", + } else if ( !strncasecmp( c->argv[ i ], INTERVALSTR "=", STRLENOF( INTERVALSTR "=" ) ) ) { - val = cargv[ i ] + STRLENOF( INTERVALSTR "=" ); + val = c->argv[ i ] + STRLENOF( INTERVALSTR "=" ); if ( si->si_type == LDAP_SYNC_REFRESH_AND_PERSIST ) { si->si_interval = 0; - } else { - char *hstr; - char *mstr; - char *dstr; - char *sstr; - int dd, hh, mm, ss; - dstr = val; - hstr = strchr( dstr, ':' ); - if ( hstr == NULL ) { - fprintf( stderr, "Error: parse_syncrepl_line: " - "invalid interval \"%s\"\n", val ); + } else if ( strchr( val, ':' ) != NULL ) { + char *next, *ptr = val; + unsigned dd, hh, mm, ss; + dd = strtoul( ptr, &next, 10 ); + if ( next == ptr || next[0] != ':' ) { + snprintf( c->msg, sizeof( c->msg ), + "Error: parse_syncrepl_line: " + "invalid interval \"%s\", unable to parse days", val ); + Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->msg, 0 ); return -1; } - *hstr++ = '\0'; - mstr = strchr( hstr, ':' ); - if ( mstr == NULL ) { - fprintf( stderr, "Error: parse_syncrepl_line: " - "invalid interval \"%s\"\n", val ); + ptr = next + 1; + hh = strtoul( ptr, &next, 10 ); + if ( next == ptr || next[0] != ':' || hh > 24 ) { + snprintf( c->msg, sizeof( c->msg ), + "Error: parse_syncrepl_line: " + "invalid interval \"%s\", unable to parse hours", val ); + Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->msg, 0 ); return -1; } - *mstr++ = '\0'; - sstr = strchr( mstr, ':' ); - if ( sstr == NULL ) { - fprintf( stderr, "Error: parse_syncrepl_line: " - "invalid interval \"%s\"\n", val ); + ptr = next + 1; + mm = strtoul( ptr, &next, 10 ); + if ( next == ptr || next[0] != ':' || mm > 60 ) { + snprintf( c->msg, sizeof( c->msg ), + "Error: parse_syncrepl_line: " + "invalid interval \"%s\", unable to parse minutes", val ); + Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->msg, 0 ); return -1; } - *sstr++ = '\0'; - - dd = atoi( dstr ); - hh = atoi( hstr ); - mm = atoi( mstr ); - ss = atoi( sstr ); - if (( hh > 24 ) || ( hh < 0 ) || - ( mm > 60 ) || ( mm < 0 ) || - ( ss > 60 ) || ( ss < 0 ) || ( dd < 0 )) { - fprintf( stderr, "Error: parse_syncrepl_line: " - "invalid interval \"%s\"\n", val ); + ptr = next + 1; + ss = strtoul( ptr, &next, 10 ); + if ( next == ptr || next[0] != '\0' || ss > 60 ) { + snprintf( c->msg, sizeof( c->msg ), + "Error: parse_syncrepl_line: " + "invalid interval \"%s\", unable to parse seconds", val ); + Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->msg, 0 ); return -1; } si->si_interval = (( dd * 24 + hh ) * 60 + mm ) * 60 + ss; + } else { + unsigned long t; + + if ( lutil_parse_time( val, &t ) != 0 ) { + snprintf( c->msg, sizeof( c->msg ), + "Error: parse_syncrepl_line: " + "invalid interval \"%s\"", val ); + Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->msg, 0 ); + return -1; + } + si->si_interval = (time_t)t; } if ( si->si_interval < 0 ) { - fprintf( stderr, "Error: parse_syncrepl_line: " - "invalid interval \"%ld\"\n", + snprintf( c->msg, sizeof( c->msg ), + "Error: parse_syncrepl_line: " + "invalid interval \"%ld\"", (long) si->si_interval); + Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->msg, 0 ); return -1; } - } else if ( !strncasecmp( cargv[ i ], RETRYSTR "=", + } else if ( !strncasecmp( c->argv[ i ], RETRYSTR "=", STRLENOF( RETRYSTR "=" ) ) ) { char **retry_list; int j, k, n; - val = cargv[ i ] + STRLENOF( RETRYSTR "=" ); + val = c->argv[ i ] + STRLENOF( RETRYSTR "=" ); retry_list = (char **) ch_calloc( 1, sizeof( char * )); retry_list[0] = NULL; @@ -2953,27 +2978,51 @@ parse_syncrepl_line( for ( k = 0; retry_list && retry_list[k]; k++ ) ; n = k / 2; if ( k % 2 ) { - fprintf( stderr, - "Error: incomplete syncrepl retry list\n" ); + snprintf( c->msg, sizeof( c->msg ), + "Error: incomplete syncrepl retry list" ); + Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->msg, 0 ); for ( k = 0; retry_list && retry_list[k]; k++ ) { ch_free( retry_list[k] ); } ch_free( retry_list ); - exit( EXIT_FAILURE ); + return 1; } si->si_retryinterval = (time_t *) ch_calloc( n + 1, sizeof( time_t )); si->si_retrynum = (int *) ch_calloc( n + 1, sizeof( int )); si->si_retrynum_init = (int *) ch_calloc( n + 1, sizeof( int )); for ( j = 0; j < n; j++ ) { - si->si_retryinterval[j] = atoi( retry_list[j*2] ); + unsigned long t; + if ( lutil_atoul( &t, retry_list[j*2] ) != 0 ) { + snprintf( c->msg, sizeof( c->msg ), + "Error: invalid retry interval \"%s\" (#%d)", + retry_list[j*2], j ); + Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->msg, 0 ); + /* do some cleanup */ + return 1; + } + si->si_retryinterval[j] = (time_t)t; if ( *retry_list[j*2+1] == '+' ) { si->si_retrynum_init[j] = -1; si->si_retrynum[j] = -1; j++; break; } else { - si->si_retrynum_init[j] = atoi( retry_list[j*2+1] ); - si->si_retrynum[j] = atoi( retry_list[j*2+1] ); + if ( lutil_atoi( &si->si_retrynum_init[j], retry_list[j*2+1] ) != 0 ) { + snprintf( c->msg, sizeof( c->msg ), + "Error: invalid initial retry number \"%s\" (#%d)", + retry_list[j*2+1], j ); + Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->msg, 0 ); + /* do some cleanup */ + return 1; + } + if ( lutil_atoi( &si->si_retrynum[j], retry_list[j*2+1] ) != 0 ) { + snprintf( c->msg, sizeof( c->msg ), + "Error: invalid retry number \"%s\" (#%d)", + retry_list[j*2+1], j ); + Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->msg, 0 ); + /* do some cleanup */ + return 1; + } } } si->si_retrynum_init[j] = -2; @@ -2984,36 +3033,59 @@ parse_syncrepl_line( ch_free( retry_list[k] ); } ch_free( retry_list ); - } else if ( !strncasecmp( cargv[ i ], MANAGEDSAITSTR "=", + } else if ( !strncasecmp( c->argv[ i ], MANAGEDSAITSTR "=", STRLENOF( MANAGEDSAITSTR "=" ) ) ) { - val = cargv[ i ] + STRLENOF( MANAGEDSAITSTR "=" ); - si->si_manageDSAit = atoi( val ); - } else if ( !strncasecmp( cargv[ i ], SLIMITSTR "=", + val = c->argv[ i ] + STRLENOF( MANAGEDSAITSTR "=" ); + if ( lutil_atoi( &si->si_manageDSAit, val ) != 0 + || si->si_manageDSAit < 0 || si->si_manageDSAit > 1 ) + { + snprintf( c->msg, sizeof( c->msg ), + "invalid manageDSAit value \"%s\".\n", + val ); + Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->msg, 0 ); + return 1; + } + } else if ( !strncasecmp( c->argv[ i ], SLIMITSTR "=", STRLENOF( SLIMITSTR "=") ) ) { - val = cargv[ i ] + STRLENOF( SLIMITSTR "=" ); - si->si_slimit = atoi( val ); - } else if ( !strncasecmp( cargv[ i ], TLIMITSTR "=", + val = c->argv[ i ] + STRLENOF( SLIMITSTR "=" ); + if ( lutil_atoi( &si->si_slimit, val ) != 0 ) { + snprintf( c->msg, sizeof( c->msg ), + "invalid size limit value \"%s\".\n", + val ); + Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->msg, 0 ); + return 1; + } + } else if ( !strncasecmp( c->argv[ i ], TLIMITSTR "=", STRLENOF( TLIMITSTR "=" ) ) ) { - val = cargv[ i ] + STRLENOF( TLIMITSTR "=" ); - si->si_tlimit = atoi( val ); - } else if ( !strncasecmp( cargv[ i ], SYNCDATASTR "=", + val = c->argv[ i ] + STRLENOF( TLIMITSTR "=" ); + if ( lutil_atoi( &si->si_tlimit, val ) != 0 ) { + snprintf( c->msg, sizeof( c->msg ), + "invalid time limit value \"%s\".\n", + val ); + Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->msg, 0 ); + return 1; + } + } else if ( !strncasecmp( c->argv[ i ], SYNCDATASTR "=", STRLENOF( SYNCDATASTR "=" ) ) ) { - val = cargv[ i ] + STRLENOF( SYNCDATASTR "=" ); + val = c->argv[ i ] + STRLENOF( SYNCDATASTR "=" ); si->si_syncdata = verb_to_mask( val, datamodes ); - } else if ( bindconf_parse( cargv[i], &si->si_bindconf )) { - fprintf( stderr, "Error: parse_syncrepl_line: " - "unknown keyword \"%s\"\n", cargv[ i ] ); + } else if ( bindconf_parse( c->argv[i], &si->si_bindconf ) ) { + snprintf( c->msg, sizeof( c->msg ), + "Error: parse_syncrepl_line: " + "unknown keyword \"%s\"\n", c->argv[ i ] ); + Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->msg, 0 ); return -1; } } if ( gots != GOT_ALL ) { - fprintf( stderr, + snprintf( c->msg, sizeof( c->msg ), "Error: Malformed \"syncrepl\" line in slapd config file" ); + Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->msg, 0 ); return -1; } @@ -3022,17 +3094,14 @@ parse_syncrepl_line( static int add_syncrepl( - Backend *be, - char **cargv, - int cargc -) + ConfigArgs *c ) { syncinfo_t *si; int rc = 0; - if ( !( be->be_search && be->be_add && be->be_modify && be->be_delete )) { + if ( !( c->be->be_search && c->be->be_add && c->be->be_modify && c->be->be_delete ) ) { Debug( LDAP_DEBUG_ANY, "database %s does not support operations " - "required for syncrepl\n", be->be_type, 0, 0 ); + "required for syncrepl\n", c->be->be_type, 0, 0 ); return 1; } si = (syncinfo_t *) ch_calloc( 1, sizeof( syncinfo_t ) ); @@ -3070,13 +3139,13 @@ add_syncrepl( LDAP_LIST_INIT( &si->si_nonpresentlist ); ldap_pvt_thread_mutex_init( &si->si_mutex ); - rc = parse_syncrepl_line( cargv, cargc, si ); + rc = parse_syncrepl_line( c, si ); if ( rc == 0 ) { - si->si_be = be; + si->si_be = c->be; init_syncrepl( si ); si->si_re = ldap_pvt_runqueue_insert( &slapd_rq, si->si_interval, - do_syncrepl, si, "do_syncrepl", be->be_suffix[0].bv_val ); + do_syncrepl, si, "do_syncrepl", c->be->be_suffix[0].bv_val ); if ( !si->si_re ) rc = -1; } @@ -3090,9 +3159,9 @@ add_syncrepl( BER_BVISNULL( &si->si_bindconf.sb_uri ) ? "(null)" : si->si_bindconf.sb_uri.bv_val, 0, 0 ); if ( !si->si_schemachecking ) { - SLAP_DBFLAGS(be) |= SLAP_DBFLAG_NO_SCHEMA_CHECK; + SLAP_DBFLAGS(c->be) |= SLAP_DBFLAG_NO_SCHEMA_CHECK; } - be->be_syncinfo = si; + c->be->be_syncinfo = si; return 0; } } @@ -3226,7 +3295,8 @@ syncrepl_unparse( syncinfo_t *si, struct berval *bv ) } int -syncrepl_config(ConfigArgs *c) { +syncrepl_config( ConfigArgs *c ) +{ if (c->op == SLAP_CONFIG_EMIT) { if ( c->be->be_syncinfo ) { struct berval bv; @@ -3241,22 +3311,22 @@ syncrepl_config(ConfigArgs *c) { if ( c->be->be_syncinfo ) { re = c->be->be_syncinfo->si_re; if ( re ) { - if ( ldap_pvt_runqueue_isrunning( &slapd_rq, re )) + if ( ldap_pvt_runqueue_isrunning( &slapd_rq, re ) ) ldap_pvt_runqueue_stoptask( &slapd_rq, re ); ldap_pvt_runqueue_remove( &slapd_rq, re ); } syncinfo_free( c->be->be_syncinfo ); c->be->be_syncinfo = NULL; } - SLAP_DBFLAGS(c->be) &= ~(SLAP_DBFLAG_SHADOW|SLAP_DBFLAG_SYNC_SHADOW); + SLAP_DBFLAGS( c->be ) &= ~(SLAP_DBFLAG_SHADOW|SLAP_DBFLAG_SYNC_SHADOW); return 0; } - if(SLAP_SHADOW(c->be)) { + if ( SLAP_SHADOW( c->be ) ) { Debug(LDAP_DEBUG_ANY, "%s: " "syncrepl: database already shadowed.\n", c->log, 0, 0); return(1); - } else if(add_syncrepl(c->be, c->argv, c->argc)) { + } else if ( add_syncrepl( c ) ) { return(1); } SLAP_DBFLAGS(c->be) |= (SLAP_DBFLAG_SHADOW | SLAP_DBFLAG_SYNC_SHADOW); -- 2.39.5