[svn] GnuPG - r5399 - branches/STABLE-BRANCH-2-0/tools

[svn author wk]

Author: wk
Date: 2010-08-19 13:41:43 +0200 (Thu, 19 Aug 2010)
New Revision: 5399

Modified:
   branches/STABLE-BRANCH-2-0/tools/ChangeLog
   branches/STABLE-BRANCH-2-0/tools/gpgconf.c
Log:
Fix --check-options


Modified: branches/STABLE-BRANCH-2-0/tools/ChangeLog
===================================================================
--- branches/STABLE-BRANCH-2-0/tools/ChangeLog	2010-08-19 09:53:55 UTC (rev 5398)
+++ branches/STABLE-BRANCH-2-0/tools/ChangeLog	2010-08-19 11:41:43 UTC (rev 5399)
@@ -1,13 +1,17 @@
+2010-08-19  Werner Koch  <wk at g10code.com>
+
+	* gpgconf.c (main): Fix --check-options.
+
 2010-02-11  Marcus Brinkmann  <marcus at g10code.de>
 
 	From 2009-09-23, 2009-11-04, 2009-11-05, 2009-12-08:
-	
+
 	* gpg-connect-agent.c (read_and_print_response): Add arg WITHHASH.
 	(getinfo_pid_cb, read_and_print_response)
 	(main): Pass true for WITHHASH for the HELP command.  Update to
 	new Assuan API.  Update use of assuan_socket_connect and
 	assuan_pipe_connect.  Convert posix fd to assuan fd.
-	
+
 2010-01-10  Werner Koch  <wk at g10code.com>
 
 	* symcryptrun.c (utmp.h): Remove header; it is not used.

Modified: branches/STABLE-BRANCH-2-0/tools/gpgconf.c
===================================================================
--- branches/STABLE-BRANCH-2-0/tools/gpgconf.c	2010-08-19 09:53:55 UTC (rev 5398)
+++ branches/STABLE-BRANCH-2-0/tools/gpgconf.c	2010-08-19 11:41:43 UTC (rev 5399)
@@ -226,15 +226,18 @@
 	      putc ('\n', stderr);
 	      exit (1);
 	    }
-	  gc_component_retrieve_options (idx);
-          if (gc_process_gpgconf_conf (NULL, 1, 0, NULL))
-            exit (1);
-	  if (cmd == aListOptions)
-	    gc_component_list_options (idx, get_outfp (&outfp));
-	  else if (cmd == aChangeOptions)
-            gc_component_change_options (idx, stdin, get_outfp (&outfp));
-	  else
+	  if (cmd == aCheckOptions)
 	    gc_component_check_options (idx, get_outfp (&outfp), NULL);
+          else
+            {
+              gc_component_retrieve_options (idx);
+              if (gc_process_gpgconf_conf (NULL, 1, 0, NULL))
+                exit (1);
+              if (cmd == aListOptions)
+                gc_component_list_options (idx, get_outfp (&outfp));
+              else if (cmd == aChangeOptions)
+                gc_component_change_options (idx, stdin, get_outfp (&outfp));
+            }
 	}
       break;