diff options
author | David Shaw <[email protected]> | 2003-12-02 05:22:42 +0000 |
---|---|---|
committer | David Shaw <[email protected]> | 2003-12-02 05:22:42 +0000 |
commit | 39e551985d74d6ee9a87bde1c32ecdd1433c00cf (patch) | |
tree | 4b0edcd3419a03444659b3b0b4b22ceca4c0aa6b /g10/g10.c | |
parent | * config.links: Show target in asm-syntax.h file and include targets for (diff) | |
download | gnupg-39e551985d74d6ee9a87bde1c32ecdd1433c00cf.tar.gz gnupg-39e551985d74d6ee9a87bde1c32ecdd1433c00cf.zip |
* 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.
Diffstat (limited to 'g10/g10.c')
-rw-r--r-- | g10/g10.c | 29 |
1 files changed, 24 insertions, 5 deletions
@@ -645,6 +645,19 @@ strusage( int level ) case 19: p = _("Please report bugs to <[email protected]>.\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) |