projects
/
monkeysphere.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
9b9b23c
)
monkeysphere-host: reverting from host_fingerprints() to list_primary_fingerprints()
author
Daniel Kahn Gillmor
<dkg@fifthhorseman.net>
Mon, 18 Jan 2010 22:46:12 +0000
(17:46 -0500)
committer
Daniel Kahn Gillmor
<dkg@fifthhorseman.net>
Mon, 18 Jan 2010 22:46:12 +0000
(17:46 -0500)
src/monkeysphere-host
patch
|
blob
|
history
diff --git
a/src/monkeysphere-host
b/src/monkeysphere-host
index c9b6a4c683a6410cf178b25fc5cd9c318af4bb0b..1fa3aea32901cc858677116bc1dcf56dc45b1852 100755
(executable)
--- a/
src/monkeysphere-host
+++ b/
src/monkeysphere-host
@@
-97,14
+97,6
@@
update_pgp_pub_file() {
> "$HOST_KEY_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"
# 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
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)
case ${#fprs[@]} in
0)
@@
-165,7
+157,7
@@
multi_key() {
shift
local keys=$@
local i=0
shift
local keys=$@
local i=0
- local fprs=($(
host_fingerprints
))
+ local fprs=($(
list_primary_fingerprints <"$HOST_KEY_FILE"
))
local key
check_no_keys
local key
check_no_keys