diff options
Diffstat (limited to 'g10/trustdb.c')
| -rw-r--r-- | g10/trustdb.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/g10/trustdb.c b/g10/trustdb.c index 1791f2882..eb244143e 100644 --- a/g10/trustdb.c +++ b/g10/trustdb.c @@ -2326,7 +2326,8 @@ check_trust( PKT_public_key *pk, unsigned *r_trustlevel, log_info(_("key %08lX.%lu: created in future " "(time warp or clock problem)\n"), (ulong)keyid[1], pk->local_id ); - return G10ERR_TIME_CONFLICT; + if( !opt.ignore_time_conflict ) + return G10ERR_TIME_CONFLICT; } if( !(rec.r.dir.dirflags & DIRF_CHECKED) ) |