[tor-commits] [flashproxy/master] Get rid of -k alias for --facilitator-pubkey.

[dcf at torproject.org]

commit a921d1becd608541fcfc84998895649ebd8e52bb
Author: David Fifield <david at bamsoftware.com>
Date:   Mon Apr 29 23:51:05 2013 -0700

    Get rid of -k alias for --facilitator-pubkey.
    
    I expect this will be an option used only in special circumstances.
---
 flashproxy-reg-email |    8 +++++---
 flashproxy-reg-url   |   14 ++++++++------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/flashproxy-reg-email b/flashproxy-reg-email
index 5164c7e..f5ab0d0 100755
--- a/flashproxy-reg-email
+++ b/flashproxy-reg-email
@@ -110,7 +110,9 @@ This program requires the M2Crypto library for Python.
   -6                      name lookups use only IPv6.
   -d, --debug             enable debugging output (Python smtplib messages).
   -e, --email=ADDRESS     send mail to ADDRESS (default "%(email_addr)s").
-  -k, --facilitator-pubkey=FILE     corresponds to the reg-daemon private key
+      --facilitator-pubkey=FILENAME
+                          encrypt registrations to the given PEM-formatted
+                            public key (default built-in).
   -h, --help              show this help.
   -s, --smtp=HOST[:PORT]  use the given SMTP server
                             (default "%(smtp_addr)s").\
@@ -188,7 +190,7 @@ options.remote_addr = (DEFAULT_REMOTE_ADDRESS, DEFAULT_REMOTE_PORT)
 options.email_addr = DEFAULT_EMAIL_ADDRESS
 options.smtp_addr = (DEFAULT_SMTP_HOST, DEFAULT_SMTP_PORT)
 
-opts, args = getopt.gnu_getopt(sys.argv[1:], "46de:k:hs:",
+opts, args = getopt.gnu_getopt(sys.argv[1:], "46de:hs:",
     ["debug", "email=", "facilitator-pubkey=", "help", "smtp="])
 for o, a in opts:
     if o == "-4":
@@ -199,7 +201,7 @@ for o, a in opts:
         options.debug = True
     elif o == "-e" or o == "--email":
         options.email_addr = a
-    elif o == "-k" or o == "--facilitator-pubkey":
+    elif o == "--facilitator-pubkey":
         options.facilitator_pubkey_filename = a
     elif o == "-h" or o == "--help":
         usage()
diff --git a/flashproxy-reg-url b/flashproxy-reg-url
index b094b9b..548e965 100755
--- a/flashproxy-reg-url
+++ b/flashproxy-reg-url
@@ -41,10 +41,12 @@ Print a URL, which, when retrieved, will cause the client address
 REMOTE[:PORT] to be registered with the flash proxy facilitator. The
 default PORT is %(port)d.
 
-  -f, --facilitator=URL         register with the given facilitator
-                                  (by default "%(fac_url)s").
-  -k, --facilitator-pubkey=FILE corresponds to the reg-daemon private key
-  -h, --help                    show this help.\
+  -f, --facilitator=URL  register with the given facilitator
+                           (by default "%(fac_url)s").
+      --facilitator-pubkey=FILENAME
+                         encrypt registrations to the given PEM-formatted
+                           public key (default built-in).
+  -h, --help             show this help.\
 """ % {
     "progname": sys.argv[0],
     "fac_url": DEFAULT_FACILITATOR_URL,
@@ -103,12 +105,12 @@ def format_addr(addr):
 
 options.facilitator_url = DEFAULT_FACILITATOR_URL
 
-opt, args = getopt.gnu_getopt(sys.argv[1:], "f:k:h",
+opt, args = getopt.gnu_getopt(sys.argv[1:], "f:h",
     ["facilitator=", "facilitator-pubkey=", "help"])
 for o, a in opt:
     if o == "-f" or o == "--facilitator":
         options.facilitator_url = a
-    elif o == "-k" or o == "--facilitator-pubkey":
+    elif o == "--facilitator-pubkey":
         options.facilitator_pubkey_filename = a
     elif o == "-h" or o == "--help":
         usage()