[tor-commits] [flashproxy/master] Move facilitator_publickey_filename into the global options block.

[dcf at torproject.org]

commit b1be79a1132d6b16e46af4148711ae7a8bb147de
Author: David Fifield <david at bamsoftware.com>
Date:   Mon Apr 29 23:41:45 2013 -0700

    Move facilitator_publickey_filename into the global options block.
---
 flashproxy-reg-email |    2 +-
 flashproxy-reg-url   |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/flashproxy-reg-email b/flashproxy-reg-email
index 6336bb1..2d333bc 100755
--- a/flashproxy-reg-email
+++ b/flashproxy-reg-email
@@ -91,6 +91,7 @@ class options(object):
     smtp_addr = None
     debug = False
     address_family = socket.AF_UNSPEC
+    facilitator_publickey_filename = None
 
 def usage(f = sys.stdout):
     print >> f, """\
@@ -186,7 +187,6 @@ def get_state_dir():
 options.remote_addr = (DEFAULT_REMOTE_ADDRESS, DEFAULT_REMOTE_PORT)
 options.email_addr = DEFAULT_EMAIL_ADDRESS
 options.smtp_addr = (DEFAULT_SMTP_HOST, DEFAULT_SMTP_PORT)
-options.facilitator_publickey_filename = None
 
 opts, args = getopt.gnu_getopt(sys.argv[1:], "46de:k:hs:",
     ["debug", "email=", "facilitator-pubkey=", "help", "smtp="])
diff --git a/flashproxy-reg-url b/flashproxy-reg-url
index 4a4a555..e1497de 100755
--- a/flashproxy-reg-url
+++ b/flashproxy-reg-url
@@ -32,6 +32,7 @@ def get_facilitator_pubkey(filename):
 
 class options(object):
     facilitator_url = None
+    facilitator_publickey_filename = None
 
 def usage(f = sys.stdout):
     print >> f, """\
@@ -101,7 +102,6 @@ def format_addr(addr):
     return result
 
 options.facilitator_url = DEFAULT_FACILITATOR_URL
-options.facilitator_publickey_filename = None
 
 opt, args = getopt.gnu_getopt(sys.argv[1:], "f:k:h",
     ["facilitator=", "facilitator-pubkey=", "help"])