[git] GnuPG - branch, master, updated. post-nuke-of-trailing-ws-44-gb5f585f

by Ben Kibbey cvs at cvs.gnupg.org
Mon Apr 18 11:55:06 CEST 2011


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".

The branch, master has been updated
       via  b5f585f7d796313cf7ae3d3fd35ed462a1f3d574 (commit)
      from  b3c71eb26b4420bd79ce72b94ac773c6636c525a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit b5f585f7d796313cf7ae3d3fd35ed462a1f3d574
Author: Ben Kibbey <bjk at luxsci.net>
Date:   Sun Apr 17 16:48:44 2011 -0400

    Another PASSWD --preset fix.
    
    Check for an error before presetting the passphrase.

diff --git a/agent/ChangeLog b/agent/ChangeLog
index cd781e2..e8570f7 100644
--- a/agent/ChangeLog
+++ b/agent/ChangeLog
@@ -1,3 +1,7 @@
+2011-04-17  Ben Kibbey <bjk at luxsci.net>
+
+	* command.c (cmd_passwd): Check for an error before presetting.
+
 2011-04-12  Ben Kibbey <bjk at luxsci.net>
 
 	* command.c (cmd_passwd): Fixed --preset when not previously cached.
diff --git a/agent/command.c b/agent/command.c
index d2ed23a..9f45afb 100644
--- a/agent/command.c
+++ b/agent/command.c
@@ -1530,7 +1530,7 @@ cmd_passwd (assuan_context_t ctx, char *line)
                 }
             }
         }
-      if (opt_preset)
+      if (!err && opt_preset)
       {
 	  char hexgrip[40+1];
 	  bin2hex(grip, 20, hexgrip);

-----------------------------------------------------------------------

Summary of changes:
 agent/ChangeLog |    4 ++++
 agent/command.c |    2 +-
 2 files changed, 5 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org




More information about the Gnupg-commits mailing list