[Pkg-gnupg-commit] [gnupg2] 47/118: gpg: Avoid homedir creation by --list-config

[Daniel Kahn Gillmor]

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

dkg pushed a commit to branch encoding-and-speling
in repository gnupg2.

commit 38d369de13acb95208a0ed8d1cf82ac19173688f
Author: Werner Koch <wk at gnupg.org>
Date:   Thu Sep 1 19:22:48 2016 +0200

    gpg: Avoid homedir creation by --list-config
    
    * g10/gpg.c (main): Do not register a key for the list config
    commands.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>
---
 g10/gpg.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/g10/gpg.c b/g10/gpg.c
index a9770d7..0b0fb7e 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -2377,11 +2377,16 @@ main (int argc, char **argv)
       {
 	switch( pargs.r_opt )
 	  {
-	  case aCheckKeys:
 	  case aListConfig:
 	  case aListGcryptConfig:
           case aGPGConfList:
           case aGPGConfTest:
+            set_cmd (&cmd, pargs.r_opt);
+            /* Do not register a keyring for these commands.  */
+            default_keyring = -1;
+            break;
+
+	  case aCheckKeys:
 	  case aListPackets:
 	  case aImport:
 	  case aFastImport:
@@ -3789,6 +3794,8 @@ main (int argc, char **argv)
       case aGenRandom:
       case aDeArmor:
       case aEnArmor:
+      case aListConfig:
+      case aListGcryptConfig:
 	break;
       case aFixTrustDB:
       case aExportOwnerTrust:

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