projects
/
monkeysphere.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'jrollins/master'
[monkeysphere.git]
/
src
/
share
/
mh
/
import_key
diff --git
a/src/share/mh/import_key
b/src/share/mh/import_key
index ed6ee4f1805c127f1c5866b43be0ddb3625c5530..bca7319c0e400a30977d5e70152e7d6b3cb41360 100644
(file)
--- a/
src/share/mh/import_key
+++ b/
src/share/mh/import_key
@@
-21,7
+21,7
@@
hostName="$1"
# use the default hostname if not specified
if [ -z "$hostName" ] ; then
# use the default hostname if not specified
if [ -z "$hostName" ] ; then
- hostName=$(hostname -f)
+ hostName=$(hostname -f)
|| failure "Could not determine hostname."
# test that the domain is not obviously illegitimate
domain=${foo##*.}
case $domain in
# test that the domain is not obviously illegitimate
domain=${foo##*.}
case $domain in
@@
-39,7
+39,6
@@
userID="ssh://${hostName}"
# create host home
mkdir -p "${MHDATADIR}"
# create host home
mkdir -p "${MHDATADIR}"
-mkdir -p "${MHTMPDIR}"
mkdir -p "${GNUPGHOME_HOST}"
chmod 700 "${GNUPGHOME_HOST}"
mkdir -p "${GNUPGHOME_HOST}"
chmod 700 "${GNUPGHOME_HOST}"
@@
-54,14
+53,10
@@
PEM2OPENPGP_USAGE_FLAGS=authenticate pem2openpgp "$userID" \
# that's what we're trying to produce (see below).
load_fingerprint_secret
# that's what we're trying to produce (see below).
load_fingerprint_secret
-# set ultimate owner trust on the newly imported key
-printf "%s:6:\n" "$HOST_FINGERPRINT" | gpg_host --import-ownertrust
-
-# update trustdb
-gpg_host --check-trustdb
-
# export to gpg public key to file
# export to gpg public key to file
-create_gpg_pub_file
+update_gpg_pub_file
+
+log info "host key imported:"
# show info about new key
show_key
# show info about new key
show_key