mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-14 21:47:19 +02:00
* g10.c (strusage, main): Show development version warning in --version
output. * trustdb.c (mark_usable_uid_certs): Disallow signatures to and from an Elgamal signing key in the trustdb.
This commit is contained in:
parent
a2d7e4b27c
commit
39e551985d
3 changed files with 50 additions and 7 deletions
29
g10/g10.c
29
g10/g10.c
|
@ -645,6 +645,19 @@ strusage( int level )
|
|||
case 19: p =
|
||||
_("Please report bugs to <gnupg-bugs@gnu.org>.\n");
|
||||
break;
|
||||
|
||||
#ifdef IS_DEVELOPMENT_VERSION
|
||||
case 20:
|
||||
p="NOTE: THIS IS A DEVELOPMENT VERSION!";
|
||||
break;
|
||||
case 21:
|
||||
p="It is only intended for test purposes and should NOT be";
|
||||
break;
|
||||
case 22:
|
||||
p="used in a production environment or with production keys!";
|
||||
break;
|
||||
#endif
|
||||
|
||||
case 1:
|
||||
case 40: p =
|
||||
_("Usage: gpg [options] [files] (-h for help)");
|
||||
|
@ -1754,11 +1767,17 @@ main( int argc, char **argv )
|
|||
fprintf(stderr, "%s\n", strusage(15) );
|
||||
}
|
||||
#ifdef IS_DEVELOPMENT_VERSION
|
||||
if( !opt.batch ) {
|
||||
log_info("NOTE: THIS IS A DEVELOPMENT VERSION!\n");
|
||||
log_info("It is only intended for test purposes and should NOT be\n");
|
||||
log_info("used in a production environment or with production keys!\n");
|
||||
}
|
||||
if( !opt.batch )
|
||||
{
|
||||
const char *s;
|
||||
|
||||
if((s=strusage(20)))
|
||||
log_info("%s\n",s);
|
||||
if((s=strusage(21)))
|
||||
log_info("%s\n",s);
|
||||
if((s=strusage(22)))
|
||||
log_info("%s\n",s);
|
||||
}
|
||||
#endif
|
||||
|
||||
if (opt.verbose > 2)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue