summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>2010-01-18 17:46:12 -0500
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>2010-01-18 17:46:12 -0500
commitd1f2eb3152412b62d17f15db519efa38a9bd6710 (patch)
tree63a90b76823751f567fd90ef2cba809176c63021 /src
parent9b9b23c821e9309dd04cc3f193885ec5f32a0fdc (diff)
monkeysphere-host: reverting from host_fingerprints() to list_primary_fingerprints()
Diffstat (limited to 'src')
-rwxr-xr-xsrc/monkeysphere-host12
1 files changed, 2 insertions, 10 deletions
diff --git a/src/monkeysphere-host b/src/monkeysphere-host
index c9b6a4c..1fa3aea 100755
--- a/src/monkeysphere-host
+++ b/src/monkeysphere-host
@@ -97,14 +97,6 @@ update_pgp_pub_file() {
> "$HOST_KEY_FILE"
}
-host_fingerprints() {
- local fprs=($(gpg_host --list-secret-keys --with-colons --fingerprint | grep ^fpr: | cut -f10 -d:))
-
- log debug "host key fingerprints:"
- printf '%s\n' "${fprs[@]}" | log debug
- printf '%s\n' "${fprs[@]}"
-}
-
# check that the service name is well formed
check_service_name() {
local name="$1"
@@ -123,7 +115,7 @@ Please run 'monkeysphere-host import-key' import a key."
check_key_input() {
local keyID="$1"
# array of fingerprints
- local fprs=($(host_fingerprints))
+ local fprs=($(list_primary_fingerprints <"$HOST_KEY_FILE"))
case ${#fprs[@]} in
0)
@@ -165,7 +157,7 @@ multi_key() {
shift
local keys=$@
local i=0
- local fprs=($(host_fingerprints))
+ local fprs=($(list_primary_fingerprints <"$HOST_KEY_FILE"))
local key
check_no_keys