security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-14 21:47:19 +02:00
Code Activity

Updated FSF's address.

Browse source
This commit is contained in:
Werner Koch 2006-06-20 17:21:37 +00:00
parent f89ee4a44d
commit f98537733a
180 changed files with 469 additions and 265 deletions
Download patch file Download diff file Expand all files Collapse all files

9
g10/gpg.c
View file

@ -356,6 +356,7 @@ enum cmd_and_opt_values
oAllowMultisigVerification,
oEnableDSA2,
oDisableDSA2,
oDebugAllowRun,
oNoop
};
@ -701,6 +702,8 @@ static ARGPARSE_OPTS opts[] = {
{ oNoRequireCrossCert, "no-require-cross-certification", 0, "@"},
{ oAutoKeyLocate, "auto-key-locate", 2, "@"},
{ oNoAutoKeyLocate, "no-auto-key-locate", 0, "@"},
{ oDebugAllowRun, "debug_allow_run", 0, "@"},
{0,NULL,0,NULL}
};
@ -1684,6 +1687,7 @@ main (int argc, char **argv )
int with_fpr = 0; /* make an option out of --fingerprint */
int any_explicit_recipient = 0;
int require_secmem=0,got_secmem=0;
int allow_run = 0;
#ifdef __riscos__
opt.lock_once = 1;
@ -2663,6 +2667,8 @@ main (int argc, char **argv )
case oEnableDSA2: opt.flags.dsa2=1; break;
case oDisableDSA2: opt.flags.dsa2=0; break;
case oDebugAllowRun: allow_run = 1; break;
case oNoop: break;
default : pargs.err = configfp? 1:2; break;
@ -2716,6 +2722,9 @@ main (int argc, char **argv )
}
#endif
if (!allow_run)
log_fatal ("This version of gpg is not ready for use, use gpg 1.4.x\n");
/* FIXME: We should use logging to a file only in server mode;
however we have not yet implemetyed that. Thus we try to get
away with --batch as indication for logging to file