diff options
| author | Jameson Graef Rollins <jrollins@phys.columbia.edu> | 2008-09-04 22:35:46 -0700 |
|---|---|---|
| committer | Jameson Graef Rollins <jrollins@phys.columbia.edu> | 2008-09-04 22:35:46 -0700 |
| commit | 55ea6c63bed596b086bdb3d06e64af5f97dbb55a (patch) | |
| tree | 94d2c4d21ccc6db41cf39ad9ef1ea0f6a6610524 /src | |
| parent | d4e17a8a5c4cd004997ce4f951a3f20d6e70da2f (diff) | |
| parent | 5a18c464ad8a4547d7c80aa7a508f55353e004f6 (diff) | |
Merge commit 'dkg/master'
Diffstat (limited to 'src')
| -rw-r--r-- | src/keytrans/openpgp2ssh.c | 2 | ||||
| -rwxr-xr-x | src/monkeysphere | 2 | ||||
| -rwxr-xr-x | src/monkeysphere-server | 6 |
3 files changed, 7 insertions, 3 deletions
diff --git a/src/keytrans/openpgp2ssh.c b/src/keytrans/openpgp2ssh.c index 427adc8..f16eac5 100644 --- a/src/keytrans/openpgp2ssh.c +++ b/src/keytrans/openpgp2ssh.c @@ -208,7 +208,7 @@ int emit_public_openssh_from_pgp(const gnutls_openpgp_crt_t* pgp_crt, const unsi /* variables for the output conversion: */ int pipestatus; int pipefd, child_pid; - char* const b64args[] = {"base64", "--wrap=0", NULL}; + char* const b64args[] = {"sh", "-c", "base64 | tr -c -d '[A-Za-z0-9=+/]'", NULL}; init_datum(&m); init_datum(&e); diff --git a/src/monkeysphere b/src/monkeysphere index 59cb3d6..e8ca9e2 100755 --- a/src/monkeysphere +++ b/src/monkeysphere @@ -17,7 +17,7 @@ SHARE=${MONKEYSPHERE_SHARE:-"/usr/share/monkeysphere"} export SHARE . "${SHARE}/common" || exit 1 -# date in UTF format if needed +# UTC date in ISO 8601 format if needed DATE=$(date -u '+%FT%T') # unset some environment variables that could screw things up diff --git a/src/monkeysphere-server b/src/monkeysphere-server index f147201..8139387 100755 --- a/src/monkeysphere-server +++ b/src/monkeysphere-server @@ -20,7 +20,7 @@ export SHARE VARLIB="/var/lib/monkeysphere" export VARLIB -# date in UTF format if needed +# UTC date in ISO 8601 format if needed DATE=$(date -u '+%FT%T') # unset some environment variables that could screw things up @@ -572,6 +572,10 @@ diagnostics() { echo "! No monkeysphere user found! Please create a monkeysphere system user." fi + if ! [ -d "$VARLIB" ] ; then + echo "! no $VARLIB directory found. Please create it." + fi + echo "Checking host GPG key..." if (( "$keysfound" < 1 )); then echo "! No host key found." |