diff options
Diffstat (limited to 'g10/keygen.c')
| -rw-r--r-- | g10/keygen.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/g10/keygen.c b/g10/keygen.c index 11d79d0fd..11c840786 100644 --- a/g10/keygen.c +++ b/g10/keygen.c @@ -1023,8 +1023,10 @@ generate_subkeypair( KBNODE pub_keyblock, KBNODE sec_keyblock ) "in future (time warp or clock problem)\n") : _("key has been created %lu seconds " "in future (time warp or clock problem)\n"), d ); - rc = G10ERR_TIME_CONFLICT; - goto leave; + if( !opt.ignore_time_conflict ) { + rc = G10ERR_TIME_CONFLICT; + goto leave; + } } |