RSpecVersion.todict() needs to turn values() into a list()

[sfa.git] / sfa / server / sfaserver.py

diff --git a/sfa/server/sfaserver.py b/sfa/server/sfaserver.py
index 8873e86..8e7c5f8 100644 (file)
--- a/sfa/server/sfaserver.py
+++ b/sfa/server/sfaserver.py
@@ -12,8 +12,6 @@ from sfa.server.threadedserver import ThreadedServer, SecureXMLRpcRequestHandler
 
 from sfa.util.sfalogging import logger
 from sfa.trust.certificate import Keypair, Certificate
-#should be passed to threadedserver
-#from sfa.plc.api import SfaAPI
 
 ##
 # Implements an HTTPS XML-RPC server. Generally it is expected that SFA
@@ -33,12 +31,12 @@ class SfaServer(threading.Thread):
     # @param cert_file certificate filename containing public key 
     #   (could be a GID file)
 
-    def __init__(self, ip, port, key_file, cert_file,interface):
+    def __init__(self, ip, port, key_file, cert_file, interface):
         threading.Thread.__init__(self)
         self.key = Keypair(filename = key_file)
         self.cert = Certificate(filename = cert_file)
         #self.server = SecureXMLRPCServer((ip, port), SecureXMLRpcRequestHandler, key_file, cert_file)
-        self.server = ThreadedServer((ip, port), SecureXMLRpcRequestHandler, key_file, cert_file)
+        self.server = ThreadedServer((ip, int(port)), SecureXMLRpcRequestHandler, key_file, cert_file)
         self.server.interface=interface
         self.trusted_cert_list = None
         self.register_functions()
@@ -56,7 +54,6 @@ class SfaServer(threading.Thread):
     # that was passed to it.
 
     def noop(self, cred, anything):
-        self.decode_authentication(cred)
         return anything
 
     ##