diff options
author | David Shaw <dshaw@jabberwocky.com> | 2002-10-17 13:50:46 +0200 |
---|---|---|
committer | David Shaw <dshaw@jabberwocky.com> | 2002-10-17 13:50:46 +0200 |
commit | e613304ae7b50ab87f7df57e352fec41b128e3e4 (patch) | |
tree | f9c11e302c3b488f6efe5b88fa04836ee9a2daeb | |
parent | Florian Weimer reminded me about that (diff) | |
download | gnupg2-e613304ae7b50ab87f7df57e352fec41b128e3e4.tar.xz gnupg2-e613304ae7b50ab87f7df57e352fec41b128e3e4.zip |
* g10.c (main): Handle --strict and --no-strict from the command line
before the options file is loaded.
-rw-r--r-- | g10/ChangeLog | 5 | ||||
-rw-r--r-- | g10/g10.c | 10 |
2 files changed, 15 insertions, 0 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index 42d3c9e36..fa29afee1 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,8 @@ +2002-10-17 David Shaw <dshaw@jabberwocky.com> + + * g10.c (main): Handle --strict and --no-strict from the command + line before the options file is loaded. + 2002-10-15 David Shaw <dshaw@jabberwocky.com> * g10.c (main): Disable --textmode when encrypting (symmetric or @@ -1166,6 +1166,16 @@ main( int argc, char **argv ) set_homedir ( pargs.r.ret_str ); else if( pargs.r_opt == oNoPermissionWarn ) opt.no_perm_warn=1; + else if (pargs.r_opt == oStrict ) + { + opt.strict=1; + log_set_strict(1); + } + else if (pargs.r_opt == oNoStrict ) + { + opt.strict=0; + log_set_strict(0); + } #ifdef USE_SHM_COPROCESSING else if( pargs.r_opt == oRunAsShmCP ) { /* does not make sense in a options file, we do it here, |