projects
/
monkeysphere.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
initialize msva in Xsession based on monkeysphere.conf instead of /etc/X11/Xsession.d
[monkeysphere.git]
/
src
/
share
/
common
diff --git
a/src/share/common
b/src/share/common
index 21f30656526c2684f49a7d5c54f883fb2f6424a3..37f5305a46022f59ea2ed2a1c7e1d2cb76ac4a38 100644
(file)
--- a/
src/share/common
+++ b/
src/share/common
@@
-478,7
+478,7
@@
gpg2ssh() {
keyID="$1"
keyID="$1"
- gpg --export "$keyID" | openpgp2ssh "$keyID" 2>/dev/null
+ gpg --export
--no-armor
"$keyID" | openpgp2ssh "$keyID" 2>/dev/null
}
# output known_hosts line from ssh key
}
# output known_hosts line from ssh key
@@
-1200,7
+1200,7
@@
process_authorized_user_ids() {
list_primary_fingerprints() {
local fake=$(msmktempdir)
trap "rm -rf $fake" EXIT
list_primary_fingerprints() {
local fake=$(msmktempdir)
trap "rm -rf $fake" EXIT
- GNUPGHOME="$fake" gpg --no-tty --quiet --import --ignore-time-conflict
+ GNUPGHOME="$fake" gpg --no-tty --quiet --import --ignore-time-conflict
2>/dev/null
GNUPGHOME="$fake" gpg --with-colons --fingerprint --list-keys | \
awk -F: '/^fpr:/{ print $10 }'
trap - EXIT
GNUPGHOME="$fake" gpg --with-colons --fingerprint --list-keys | \
awk -F: '/^fpr:/{ print $10 }'
trap - EXIT
@@
-1213,7
+1213,7
@@
list_primary_fingerprints() {
get_cert_info() {
local fake=$(msmktempdir)
trap "rm -rf $fake" EXIT
get_cert_info() {
local fake=$(msmktempdir)
trap "rm -rf $fake" EXIT
- GNUPGHOME="$fake" gpg --no-tty --quiet --import --ignore-time-conflict
+ GNUPGHOME="$fake" gpg --no-tty --quiet --import --ignore-time-conflict
2>/dev/null
GNUPGHOME="$fake" gpg --with-colons --fingerprint --fixed-list-mode --list-keys "$1"
trap - EXIT
rm -rf "$fake"
GNUPGHOME="$fake" gpg --with-colons --fingerprint --fixed-list-mode --list-keys "$1"
trap - EXIT
rm -rf "$fake"