← Back to branch summary

~ubuntu-branches/debian/experimental/389-ds-base/experimental

« back to all changes in this revision

Viewing changes to ldap/servers/slapd/csngen.c

  • Committer: Package Import Robot
  • Author(s): Timo Aaltonen
  • Date: 2014-07-08 15:50:11 UTC
  • mfrom: (0.2.2)
  • Revision ID: package-import@ubuntu.com-20140708155011-r66lvtioamqwaype
Tags: 1.3.2.19-1
* New upstream release.
* admin_scripts.diff: Updated to fix more bashisms.
* watch: Update the url.
* Install failedbinds.py and logregex.py scripts.
* init: Use status from init-functions.
* control: Update my email.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ldap/servers/slapd/csngen.c
326
326
    time_t remote_time, remote_offset, cur_time;
327
327
        PRUint16 remote_seqnum;
328
328
    int rc;
 
329
    extern int config_get_ignore_time_skew();
 
330
    int ignore_time_skew = config_get_ignore_time_skew();
329
331
 
330
332
    if (gen == NULL || csn == NULL)
331
333
        return CSN_INVALID_PARAMETER;
380
382
        remote_offset = remote_time - cur_time;
381
383
                if (remote_offset > gen->state.remote_offset)
382
384
                {
383
 
                        if (remote_offset <= CSN_MAX_TIME_ADJUST)
 
385
                        if (ignore_time_skew || (remote_offset <= CSN_MAX_TIME_ADJUST))
384
386
                        {
385
387
                        gen->state.remote_offset = remote_offset;
386
388
                        }
651
653
static int 
652
654
_csngen_adjust_local_time (CSNGen *gen, time_t cur_time)
653
655
{
 
656
    extern int config_get_ignore_time_skew();
 
657
    int ignore_time_skew = config_get_ignore_time_skew();
654
658
    time_t time_diff = cur_time - gen->state.sampled_time;
655
659
 
656
660
    if (time_diff == 0) {
714
718
                             gen->state.remote_offset);
715
719
        }
716
720
 
717
 
        if (abs (time_diff) > CSN_MAX_TIME_ADJUST)
 
721
        if (!ignore_time_skew && (abs (time_diff) > CSN_MAX_TIME_ADJUST))
718
722
        {
719
723
            slapi_log_error (SLAPI_LOG_FATAL, NULL, "_csngen_adjust_local_time: "
720
724
                             "adjustment limit exceeded; value - %d, limit - %d\n",