[git] GnuPG - branch, master, updated. post-nuke-of-trailing-ws-122-g781e974

[by Werner Koch]

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  781e9746dff21fc2721373205e63d1d09722d590 (commit)
      from  26b4a012e3eb3a6ce79a1e53f7cdfbbdf8c8e8f5 (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 781e9746dff21fc2721373205e63d1d09722d590
Author: Werner Koch <wk at gnupg.org>
Date:   Mon Nov 28 10:39:36 2011 +0100

    Improve ssh card key diagnostic message.
    
    * command-ssh.c (card_key_available): Change wording of no key
    diagnostic.
    (ssh_handler_request_identities): Do not call card_key_available
    if the scdaemon is disabled.

diff --git a/agent/ChangeLog b/agent/ChangeLog
index 3c52e1f..2635579 100644
--- a/agent/ChangeLog
+++ b/agent/ChangeLog
@@ -1,3 +1,10 @@
+2011-11-28  Werner Koch  <wk at g10code.com>
+
+	* command-ssh.c (card_key_available): Change wording of no key
+	diagnostic.
+	(ssh_handler_request_identities): Do not call card_key_available
+	if the scdaemon is disabled.
+
 2011-09-12  Ben Kibbey <bjk at luxsci.net>
 
 	* genkey.c (agent_ask_new_passphrase): Allow for an empty passphrase
diff --git a/agent/command-ssh.c b/agent/command-ssh.c
index 7b4d479..54e56ea 100644
--- a/agent/command-ssh.c
+++ b/agent/command-ssh.c
@@ -1710,7 +1710,7 @@ card_key_available (ctrl_t ctrl, gcry_sexp_t *r_pk, char **cardsn)
     }
   if (err)
     {
-      log_error (_("error getting default authentication keyID of card: %s\n"),
+      log_error (_("no authentication key for ssh on card: %s\n"),
                  gpg_strerror (err));
       xfree (serialno);
       return err;
@@ -1924,7 +1924,8 @@ ssh_handler_request_identities (ctrl_t ctrl,
      reader - this should be allowed even without being listed in
      sshcontrol. */
 
-  if (!card_key_available (ctrl, &key_public, &cardsn))
+  if (!opt.disable_scdaemon
+      && !card_key_available (ctrl, &key_public, &cardsn))
     {
       err = ssh_send_key_public (key_blobs, key_public, cardsn);
       gcry_sexp_release (key_public);

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

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


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