projects
/
monkeysphere.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
shipping transition script; requiring manual version synchronization between common...
[monkeysphere.git]
/
src
/
monkeysphere-host
diff --git
a/src/monkeysphere-host
b/src/monkeysphere-host
index 3bee007f8d47067c623301a9e3b10cef7b71f3e9..a86a8c91d27ad30b283b261976ad60e0522ff222 100755
(executable)
--- a/
src/monkeysphere-host
+++ b/
src/monkeysphere-host
@@
-32,10
+32,6
@@
MHSHAREDIR="${SYSSHAREDIR}/mh"
# datadir for host functions
MHDATADIR="${SYSDATADIR}/host"
# datadir for host functions
MHDATADIR="${SYSDATADIR}/host"
-# temp directory for temp gnupghome directories for add_revoker
-MHTMPDIR="${MHDATADIR}/tmp"
-export MHTMPDIR
-
# host pub key files
HOST_KEY_FILE="${SYSDATADIR}/ssh_host_rsa_key.pub.gpg"
# host pub key files
HOST_KEY_FILE="${SYSDATADIR}/ssh_host_rsa_key.pub.gpg"
@@
-77,7
+73,7
@@
EOF
# function to interact with the gpg keyring
gpg_host() {
# function to interact with the gpg keyring
gpg_host() {
- GNUPGHOME="$GNUPGHOME_HOST" gpg "$@"
+ GNUPGHOME="$GNUPGHOME_HOST" gpg
--no-greeting --quiet --no-tty
"$@"
}
# command to list the info about the host key, in colon format, to
}
# command to list the info about the host key, in colon format, to
@@
-93,8
+89,7
@@
gpg_host_list() {
# FIXME: should we supress all the edit script spew? or pipe it
# through log debug?
gpg_host_edit() {
# FIXME: should we supress all the edit script spew? or pipe it
# through log debug?
gpg_host_edit() {
- gpg_host --quiet --command-fd 0 --no-tty --edit-key \
- "0x${HOST_FINGERPRINT}!" "$@" 2>&1 | log debug
+ gpg_host --command-fd 0 --edit-key "0x${HOST_FINGERPRINT}!" "$@"
}
# export the host public key to the monkeysphere gpg pub key file
}
# export the host public key to the monkeysphere gpg pub key file
@@
-126,8
+121,7
@@
load_fingerprint() {
# gpg host secret key
load_fingerprint_secret() {
HOST_FINGERPRINT=$( \
# gpg host secret key
load_fingerprint_secret() {
HOST_FINGERPRINT=$( \
- gpg_host --quiet --list-secret-key \
- --with-colons --with-fingerprint \
+ gpg_host --list-secret-key --with-colons --with-fingerprint \
| grep '^fpr:' | cut -d: -f10 )
}
| grep '^fpr:' | cut -d: -f10 )
}
@@
-141,7
+135,7
@@
check_host_key() {
check_host_no_key() {
[ -s "$HOST_KEY_FILE" ] \
|| failure "You don't appear to have a Monkeysphere host key on this server.
check_host_no_key() {
[ -s "$HOST_KEY_FILE" ] \
|| failure "You don't appear to have a Monkeysphere host key on this server.
-Please run 'monkeysphere-host import-key' first."
+Please run 'monkeysphere-host import-key
...
' first."
}
# output the index of a user ID on the host key
}
# output the index of a user ID on the host key
@@
-173,7
+167,7
@@
show_key() {
local GNUPGHOME
# tmp gpghome dir
local GNUPGHOME
# tmp gpghome dir
- export GNUPGHOME=$(m
ktemp -d
)
+ export GNUPGHOME=$(m
smktempdir
)
# trap to remove tmp dir if break
trap "rm -rf $GNUPGHOME" EXIT
# trap to remove tmp dir if break
trap "rm -rf $GNUPGHOME" EXIT