[Pkg-gnupg-commit] [gnupg2] 11/34: g10: Always save standard revocation certificate in file.

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch upstream
in repository gnupg2.

commit dcfb01959802b27869528dda1d9a4f5e79574bb5
Author: Marcus Brinkmann <marcus.brinkmann at ruhr-uni-bochum.de>
Date:   Wed Aug 2 15:19:04 2017 +0200

    g10: Always save standard revocation certificate in file.
    
    * g10/revoke.c (gen_standard_revocation): Set opt.outfile to NULL
    temporarily to create certificate in right place.
    
    Signed-off-by: Marcus Brinkmann <mb at g10code.com>
    GnuPG-bug-id: 3015
---
 g10/revoke.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/g10/revoke.c b/g10/revoke.c
index 1dea6ae..4578700 100644
--- a/g10/revoke.c
+++ b/g10/revoke.c
@@ -532,6 +532,7 @@ gen_standard_revoke (ctrl_t ctrl, PKT_public_key *psk, const char *cache_nonce)
   u32 keyid[2];
   int kl;
   char *orig_codeset;
+  char *old_outfile;
 
   dir = get_openpgp_revocdir (gnupg_homedir ());
   tmpstr = hexfingerprint (psk, NULL, 0);
@@ -586,8 +587,11 @@ gen_standard_revoke (ctrl_t ctrl, PKT_public_key *psk, const char *cache_nonce)
 
   reason.code = 0x00; /* No particular reason.  */
   reason.desc = NULL;
+  old_outfile = opt.outfile;
+  opt.outfile = NULL;
   rc = create_revocation (ctrl,
                           fname, &reason, psk, NULL, leadin, 3, cache_nonce);
+  opt.outfile = old_outfile;
   if (!rc && !opt.quiet)
     log_info (_("revocation certificate stored as '%s.rev'\n"), fname);
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git