[git] GnuPG - branch, master, updated. post-nuke-of-trailing-ws-43-gb3c71eb

[by Ben Kibbey]

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  b3c71eb26b4420bd79ce72b94ac773c6636c525a (commit)
      from  f8c5395fbd24b9811807d7601e22b38af9f5126c (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 b3c71eb26b4420bd79ce72b94ac773c6636c525a
Author: Ben Kibbey <bjk at luxsci.net>
Date:   Tue Apr 12 20:02:05 2011 -0400

    Fixed PASSWD --preset.
    
    The previous patch required that the keygrip be cached before adding the
    new passphrase to the cache. No more.

diff --git a/agent/ChangeLog b/agent/ChangeLog
index 21cd0c4..cd781e2 100644
--- a/agent/ChangeLog
+++ b/agent/ChangeLog
@@ -1,3 +1,7 @@
+2011-04-12  Ben Kibbey <bjk at luxsci.net>
+
+	* command.c (cmd_passwd): Fixed --preset when not previously cached.
+
 2011-04-12  Werner Koch  <wk at g10code.com>
 
 	* agent.h (CACHE_TTL_NONCE, CACHE_TTL_OPT_PRESET): New.
diff --git a/agent/command.c b/agent/command.c
index e5243ed..d2ed23a 100644
--- a/agent/command.c
+++ b/agent/command.c
@@ -1528,15 +1528,15 @@ cmd_passwd (assuan_context_t ctx, char *line)
                   ctrl->server_local->last_passwd_nonce = passwd_nonce;
                   passwd_nonce = NULL;
                 }
-	      if (opt_preset)
-		{
-		  char hexgrip[40+1];
-		  bin2hex(grip, 20, hexgrip);
-		  err = agent_put_cache (hexgrip, CACHE_MODE_ANY, newpass,
-                                         CACHE_TTL_OPT_PRESET);
-		}
             }
         }
+      if (opt_preset)
+      {
+	  char hexgrip[40+1];
+	  bin2hex(grip, 20, hexgrip);
+	  err = agent_put_cache (hexgrip, CACHE_MODE_ANY, newpass,
+		  CACHE_TTL_OPT_PRESET);
+      }
       xfree (newpass);
     }
   ctrl->in_passwd--;

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

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


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