From 75e989ccee39ce99a44898cec16229f74f515efe Mon Sep 17 00:00:00 2001
From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Thu, 4 Sep 2008 23:25:14 -0400
Subject: fixing comment about dates.

---
 src/monkeysphere        | 2 +-
 src/monkeysphere-server | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

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..b609d31 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
-- 
cgit v1.2.3


From d076f454cf6c576681749ae7f31dec1bc2b52833 Mon Sep 17 00:00:00 2001
From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Thu, 4 Sep 2008 23:26:58 -0400
Subject: added new test for /var/lib/monkeysphere in m-s diagnostics.

---
 src/monkeysphere-server | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src')

diff --git a/src/monkeysphere-server b/src/monkeysphere-server
index b609d31..8139387 100755
--- a/src/monkeysphere-server
+++ b/src/monkeysphere-server
@@ -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."
-- 
cgit v1.2.3


From 9556a2f1659aa6432cc74469a25d401319d74e79 Mon Sep 17 00:00:00 2001
From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Fri, 5 Sep 2008 00:09:05 -0400
Subject: more porting tweaks: do not rely on the -w arg to base64, so we can
 use fourmilab instead of GNU

---
 src/keytrans/openpgp2ssh.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

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);
-- 
cgit v1.2.3