mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2024-12-21 03:10:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

ITS#3064 don't reset sync interval to zero on PERSIST

Browse Source
This commit is contained in:
Howard Chu 2004-05-21 23:53:14 +00:00
parent cc4d5c10df
commit 910101a267
1 changed files with 40 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
servers/slapd/config.c
View File

@ -3310,51 +3310,48 @@ parse_syncrepl_line(
} else if ( !strncasecmp( cargv[ i ], } else if ( !strncasecmp( cargv[ i ],
INTERVALSTR, sizeof( INTERVALSTR ) - 1 ) ) INTERVALSTR, sizeof( INTERVALSTR ) - 1 ) )
{ {
char *hstr;
char *mstr;
char *dstr;
char *sstr;
int dd, hh, mm, ss;
val = cargv[ i ] + sizeof( INTERVALSTR ); val = cargv[ i ] + sizeof( INTERVALSTR );
if ( si->si_type == LDAP_SYNC_REFRESH_AND_PERSIST ) { dstr = val;
si->si_interval = 0; hstr = strchr( dstr, ':' );
} else { if ( hstr == NULL ) {
char *hstr; fprintf( stderr, "Error: parse_syncrepl_line: "
char *mstr; "invalid interval \"%s\"\n", val );
char *dstr; return 1;
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 );
return 1;
}
*hstr++ = '\0';
mstr = strchr( hstr, ':' );
if ( mstr == NULL ) {
fprintf( stderr, "Error: parse_syncrepl_line: "
"invalid interval \"%s\"\n", val );
return 1;
}
*mstr++ = '\0';
sstr = strchr( mstr, ':' );
if ( sstr == NULL ) {
fprintf( stderr, "Error: parse_syncrepl_line: "
"invalid interval \"%s\"\n", val );
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 );
return 1;
}
si->si_interval = (( dd * 24 + hh ) * 60 + mm ) * 60 + ss;
} }
*hstr++ = '\0';
mstr = strchr( hstr, ':' );
if ( mstr == NULL ) {
fprintf( stderr, "Error: parse_syncrepl_line: "
"invalid interval \"%s\"\n", val );
return 1;
}
*mstr++ = '\0';
sstr = strchr( mstr, ':' );
if ( sstr == NULL ) {
fprintf( stderr, "Error: parse_syncrepl_line: "
"invalid interval \"%s\"\n", val );
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 );
return 1;
}
si->si_interval = (( dd * 24 + hh ) * 60 + mm ) * 60 + ss;
if ( si->si_interval < 0 ) { if ( si->si_interval < 0 ) {
fprintf( stderr, "Error: parse_syncrepl_line: " fprintf( stderr, "Error: parse_syncrepl_line: "
"invalid interval \"%ld\"\n", "invalid interval \"%ld\"\n",