From 7c9855aaa2819c6774ba164f9991e9972556aa3f Mon Sep 17 00:00:00 2001 From: David Shaw Date: Tue, 3 Jun 2003 17:47:58 +0000 Subject: * options.h, g10.c (main), keylist.c (list_keyblock_print): Add "show-validity" and "show-long-keyid" list-options. * gpgv.c (get_validity, trust_value_to_string): Stubs. * g10.c (main): Use SAFE_VERSION instead of VERSION in the version-specific gpg.conf file so it can be overridden on RISCOS. --- g10/g10.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'g10/g10.c') diff --git a/g10/g10.c b/g10/g10.c index ecd9c9b46..8a7f09d13 100644 --- a/g10/g10.c +++ b/g10/g10.c @@ -1260,7 +1260,7 @@ main( int argc, char **argv ) { /* Try for a version specific config file first */ configname = make_filename(opt.homedir, - "gpg" EXTSEP_S "conf-" VERSION, NULL ); + "gpg" EXTSEP_S "conf-" SAFE_VERSION, NULL ); if(access(configname,R_OK)) { m_free(configname); @@ -1752,6 +1752,8 @@ main( int argc, char **argv ) {"show-policy-url",LIST_SHOW_POLICY}, {"show-notation",LIST_SHOW_NOTATION}, {"show-keyring",LIST_SHOW_KEYRING}, + {"show-validity",LIST_SHOW_VALIDITY}, + {"show-long-keyid",LIST_SHOW_LONG_KEYID}, {NULL,0} }; -- cgit