Merge commit 'dkg/master'

diff --git a/man/man7/monkeysphere.7 b/man/man7/monkeysphere.7
index d221c87ba369dcafed6cb3f5bc6789dd44a58f31..578d96cef5f4408692478b569de7be6ae5cfb685 100644 (file)
--- a/man/man7/monkeysphere.7
+++ b/man/man7/monkeysphere.7
@@ -52,6 +52,6 @@ Daniel Kahn Gillmor <dkg@fifthhorseman.net>
 .BR openpgp2ssh (1),
 .BR pem2openpgp (1),
 .BR gpg (1),
-.BR ssh (1),
 .BR http://tools.ietf.org/html/rfc4880,
+.BR ssh (1),
 .BR http://tools.ietf.org/wg/secsh/draft-ietf-secsh-scp-sftp-ssh-uri/

diff --git a/src/transitions/0.23 b/src/transitions/0.23
index e1c9e9e140f9a8bd5ef299d71edc761d00f40e8f..6cbf99522317856677682730517559ea02c8d82c 100755 (executable)
--- a/src/transitions/0.23
+++ b/src/transitions/0.23
@@ -56,15 +56,15 @@ if [ -d "$SYSDATADIR"/gnupg-host ] ; then
 ### transfer identity certifiers, if they don't already exist in the
 ### current setup:
 
-    if [ monkeysphere-authentication list-identity-certifiers | \
-       grep -q '^[A-F0-9]{40}:$' ] ; then
+    if monkeysphere-authentication list-identity-certifiers | \
+       grep -q '^[A-F0-9]{40}:$' ; then
        log 'There are already certifiers in the new system!\nNot transferring any certifiers.\n'
     else
        # get the old host keygrip (don't know why there would be more
        # than one, but we'll transfer all tsigs made by any key that
        # had been given ultimate ownertrust):
-       for authgrip in $(GNUPGHOME="$SYSDATADIR"/gnupg-host gpg --export-ownertrust | \
-           grep ':6:$'
+       for authgrip in $(GNUPGHOME="$SYSDATADIR"/gnupg-host gpg --no-permission-warning --export-ownertrust | \
+           grep ':6:$' | \
            sed -r 's/^[A-F0-9]{24}([A-F0-9]{16}):6:$/\1/') ; do
            
        # we're assuming that old id certifiers were only added by old
@@ -79,7 +79,7 @@ if [ -d "$SYSDATADIR"/gnupg-host ] ; then
            # one of those certifications (even if later
            # certifications had different parameters).
            
-           GNUPGHOME="$SYSDATADIR"/gnupg-host gpg --fingerprint --with-colons --fixed-list-mode --check-sigs | \
+           GNUPGHOME="$SYSDATADIR"/gnupg-host gpg --no-permission-warning --fingerprint --with-colons --fixed-list-mode --check-sigs | \
                cut -f 1,2,5,8,9,10 -d: | \
                egrep '^(fpr:::::|sig:!:'"$authgrip"':[[:digit:]]+ [[:digit:]]+:)' | \
                while IFS=: read -r type validity grip trustparams trustdomain fpr ; do
@@ -121,13 +121,13 @@ if [ -d "$SYSDATADIR"/gnupg-host ] ; then
 
                            CERTKEY=$(mktemp ${TMPDIR:-/tmp}/mstransition.XXXXXXXX)
                            log "Adding identity certifier with fingerprint %s\n" "$keyfpr"
-                           GNUPGHOME="$SYSDATADIR"/gnupg-host gpg --export "0x$keyfpr" --export-clean >"$CERTKEY"
+                           GNUPGHOME="$SYSDATADIR"/gnupg-host gpg --no-permission-warning --export "0x$keyfpr" --export-clean >"$CERTKEY"
                            MONKEYSPHERE_PROMPT=false monkeysphere-authentication add-identity-certifier $finaldomain --trust "$truststring" --depth "$trustdepth" "$CERTKEY"
                            rm -f "$CERTKEY"
                            # clear the fingerprint so that we don't
                            # make additional tsigs on it if more uids
                            # are present:
-                           $keyfpr=
+                           keyfpr=
                        fi
                        ;;
                esac
@@ -141,14 +141,14 @@ if [ -d "$SYSDATADIR"/gnupg-host ] ; then
        log "Not transferring host key info because host directory already exists.\n"
     else
        if [ -s "$SYSDATADIR"/ssh_host_rsa_key ] || \
-           GNUPGHOME="$SYSDATADIR"/gnupg-host gpg --with-colons --list-secret-keys | grep -q '^sec:' ; then
+           GNUPGHOME="$SYSDATADIR"/gnupg-host gpg --no-permission-warning --with-colons --list-secret-keys | grep -q '^sec:' ; then
            
        # create host home
            mkdir -p "${MHDATADIR}"
            chmod 0700 "${MHDATADIR}"
            
            log "importing host key from old monkeysphere installation\n"
-           GNUPGHOME="$SYSDATADIR"/gnupg-host gpg --export-secret-keys \
+           GNUPGHOME="$SYSDATADIR"/gnupg-host gpg --no-permission-warning --export-secret-keys | \
                GNUPGHOME="$MHDATADIR" gpg --import
            
            monkeysphere-host update-gpg-pub-file