diff options
| author | Jameson Graef Rollins <jrollins@phys.columbia.edu> | 2008-07-23 00:10:47 -0700 |
|---|---|---|
| committer | Jameson Graef Rollins <jrollins@phys.columbia.edu> | 2008-07-23 00:10:47 -0700 |
| commit | 86b6a09beeba248440d4d9a5e923c799c542420d (patch) | |
| tree | c88f4b94a2bed44989585efd3d55ada51bae83c1 /src | |
| parent | c3ed6920551ca86defe76f4d2f629062d66a0dae (diff) | |
| parent | cc45c7363cf606e433a2c289de4bfa2dfe585c62 (diff) | |
Merge commit 'dkg/master'
Diffstat (limited to 'src')
| -rw-r--r-- | src/keytrans/openpgp2ssh.c | 2 | ||||
| -rwxr-xr-x | src/monkeysphere-server | 17 |
2 files changed, 15 insertions, 4 deletions
diff --git a/src/keytrans/openpgp2ssh.c b/src/keytrans/openpgp2ssh.c index 5cc6cfa..36fb30a 100644 --- a/src/keytrans/openpgp2ssh.c +++ b/src/keytrans/openpgp2ssh.c @@ -491,6 +491,8 @@ int main(int argc, char* argv[]) { err(0,"Translating public key\n"); ret = emit_public_openssh_from_pgp(&pgp_crt, fingerprint, fpr_size); + if (ret != 0) + return ret; } else { /* we have no idea what kind of key this is at all anyway! */ diff --git a/src/monkeysphere-server b/src/monkeysphere-server index 6534fa1..4d7acc6 100755 --- a/src/monkeysphere-server +++ b/src/monkeysphere-server @@ -47,8 +47,8 @@ subcommands: publish-key (p) publish server's host key to keyserver add-identity-certifier (a) KEYID import and tsign a certification key - -n|--domain DOMAIN domain of certifier () - -t|--trust TRUST trust level of certifier (2) + -n|--domain DOMAIN limit ID certifications to IDs in DOMAIN () + -t|--trust TRUST trust level of certifier (full) -d|--depth DEPTH trust depth for certifier (1) remove-identity-certifier (r) KEYID remove a certification key list-identity-certifiers (l) list certification keys @@ -383,10 +383,11 @@ add_certifier() { local keyID local fingerprint local ltsignCommand + local trustval # set default values for trust depth and domain domain= - trust=2 + trust=full depth=1 # get options @@ -450,12 +451,20 @@ add_certifier() { # export the key to the host keyring gpg_authentication "--export $keyID" | gpg_host --import + if [ "$trust" == marginal ]; then + trustval=1 + elif [ "$trust" == full ]; then + trustval=2 + else + failure "trust value requested ('$trust') was unclear (only 'marginal' or 'full' are supported)" + fi + # ltsign command # NOTE: *all* user IDs will be ltsigned ltsignCommand=$(cat <<EOF ltsign y -$trust +$trustval $depth $domain y |