From dda1c93bc94daa24bf7b0f5671f8a222c0089efd Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@riseup.net>
Date: Thu, 7 Aug 2008 19:19:43 -0400
Subject: alphabetize the options

---
 src/monkeysphere-server | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/monkeysphere-server b/src/monkeysphere-server
index a0b7067..0a2f04b 100755
--- a/src/monkeysphere-server
+++ b/src/monkeysphere-server
@@ -236,7 +236,7 @@ gen_key() {
     revoker=
 
     # get options
-    TEMP=$(getopt -o l:e:r: -l length:,expire:,revoker: -n "$PGRM" -- "$@")
+    TEMP=$(getopt -o e:l:r -l expire:,length:,revoker: -n "$PGRM" -- "$@")
 
     if [ $? != 0 ] ; then
 	exit 1
-- 
cgit v1.2.3


From 0e27af63f34c5bb75cef059fc9d76887251c1517 Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@riseup.net>
Date: Thu, 7 Aug 2008 19:26:33 -0400
Subject: make it so monkeysphere-server will respond to --help

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

(limited to 'src')

diff --git a/src/monkeysphere-server b/src/monkeysphere-server
index 0a2f04b..1e5f209 100755
--- a/src/monkeysphere-server
+++ b/src/monkeysphere-server
@@ -56,7 +56,7 @@ subcommands:
 
  gpg-authentication-cmd CMD          gnupg-authentication command
 
- help (h,?)                          this help
+ -h|--help|help (h,?)                this help
 EOF
 }
 
@@ -699,7 +699,7 @@ case $COMMAND in
 	gpg_authentication_cmd "$@"
 	;;
 
-    'help'|'h'|'?')
+    '--help'|'help'|'-h'|'h'|'?')
         usage
         ;;
 
-- 
cgit v1.2.3


From 68a626b30117bb7c40e3e3eedb8139f1085b8ca2 Mon Sep 17 00:00:00 2001
From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Tue, 12 Aug 2008 16:15:37 -0400
Subject: unescape *all* colons, instead of just the first one in encoded user
 IDs

---
 src/common | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/common b/src/common
index b4e786b..ff1a220 100644
--- a/src/common
+++ b/src/common
@@ -68,7 +68,7 @@ check_capability() {
 # character
 # FIXME: undo all escape character translation in with-colons gpg output
 unescape() {
-    echo "$1" | sed 's/\\x3a/:/'
+    echo "$1" | sed 's/\\x3a/:/g'
 }
 
 # remove all lines with specified string from specified file
-- 
cgit v1.2.3


From 6f34ff65e63588a27a4076ef79f0737ea38cf68b Mon Sep 17 00:00:00 2001
From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Wed, 13 Aug 2008 16:49:17 -0400
Subject: making monkeysphere-server publish-key stricter about choice of
 emitted host key.

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

(limited to 'src')

diff --git a/src/monkeysphere-server b/src/monkeysphere-server
index 3ca0656..d9b8676 100755
--- a/src/monkeysphere-server
+++ b/src/monkeysphere-server
@@ -372,10 +372,10 @@ publish_server_key() {
     # FIXME: need to figure out better way to identify host key
     # dummy command so as not to publish fakes keys during testing
     # eventually:
-    #gpg_authentication "--keyserver $KEYSERVER --send-keys $(hostname -f)"
+    #gpg_authentication "--keyserver $KEYSERVER --send-keys =ssh://$(hostname -f)"
     echo "NOT PUBLISHED (to avoid permanent publication errors during monkeysphere development)."
     echo "The following command should publish the key:"
-    echo "monkeysphere-server gpg-authentication-cmd '--keyserver $KEYSERVER --send-keys $(hostname -f)'"
+    echo "monkeysphere-server gpg-authentication-cmd '--keyserver $KEYSERVER --send-keys =ssh://$(hostname -f)'"
     exit 255
 }
 
-- 
cgit v1.2.3