X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=src%2Fmonkeysphere-server;h=19b457fed71ea65cf34fa85234f22181619ea1e6;hb=4c39f00752f9a57329aff481d33aed24bfc301a4;hp=4d7acc6cb50276bb7a46ae589d3c6995ed540252;hpb=cc45c7363cf606e433a2c289de4bfa2dfe585c62;p=monkeysphere.git diff --git a/src/monkeysphere-server b/src/monkeysphere-server index 4d7acc6..19b457f 100755 --- a/src/monkeysphere-server +++ b/src/monkeysphere-server @@ -342,6 +342,10 @@ EOF fingerprint=$(gpg_host --list-key --with-colons --with-fingerprint "=${userID}" | \ grep '^fpr:' | head -1 | cut -d: -f10) + # export host ownertrust to authentication keyring + log "setting ultimate owner trust for server key..." + echo "${fingerprint}:6:" | gpg_authentication "--import-ownertrust" + # translate the private key to ssh format, and export to a file # for sshs usage. # NOTE: assumes that the primary key is the proper key to use @@ -429,9 +433,6 @@ add_certifier() { fi export keyID - # export host ownertrust to authentication keyring - gpg_host --export-ownertrust | gpg_authentication "--import-ownertrust" - # get the key from the key server gpg_authentication "--keyserver $KEYSERVER --recv-key '$keyID'" @@ -470,7 +471,7 @@ $domain y save EOF -) + ) # ltsign the key echo "$ltsignCommand" | gpg_host --quiet --command-fd 0 --edit-key "$fingerprint"