X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=src%2Fseckey2sshagent;h=2febff8d00a4144542b5a73bf1c0b62b6fec2e27;hb=a04f56a4b5d1020a25da1ff75f3835f194bd708c;hp=2a98cf16ae11afb7e5ae4a1f45a13e6817837ea5;hpb=5c4044146eb0869129b39451599104075c9f6c82;p=monkeysphere.git

diff --git a/src/seckey2sshagent b/src/seckey2sshagent
index 2a98cf1..2febff8 100755
--- a/src/seckey2sshagent
+++ b/src/seckey2sshagent
@@ -67,8 +67,13 @@ trap cleanup EXIT
 GPGIDS="$1"
 
 if [ -z "$GPGIDS" ]; then
+    # hack: we need to get the list of secret keys, because if you
+    # --list-secret-keys with no arguments, GPG fails to print the
+    # capability flags (i've just filed this as
+    # https://bugs.g10code.com/gnupg/issue945)
+    KEYIDS=$(gpg2 --with-colons --list-secret-keys | grep ^sec | cut -f5 -d:)
     # default to using all fingerprints of authentication-enabled keys 
-    GPGIDS=$(gpg  --with-colons --fingerprint --fingerprint --list-secret-keys "$GPGID" | egrep -A1 '^(ssb|sec):.*:[^:]*a[^:]*:$' | grep ^fpr: | cut -d: -f10)
+    GPGIDS=$(gpg  --with-colons --fingerprint --fingerprint --list-secret-keys $KEYIDS | egrep -A1 '^(ssb|sec):.*:[^:]*a[^:]*:$' | grep ^fpr: | cut -d: -f10)
 fi
 
 for GPGID in $GPGIDS; do