* give all modules access to the API and to the config class

[nodemanager.git] / api.py

diff --git a/api.py b/api.py
index 0eac3e0..9b09d06 100644 (file)
--- a/api.py
+++ b/api.py
@@ -62,17 +62,17 @@ class APIRequestHandler(SimpleXMLRPCServer.SimpleXMLRPCRequestHandler):
             SO_PEERCRED = 17
             sizeof_struct_ucred = 12
             ucred = self.request.getsockopt(socket.SOL_SOCKET, SO_PEERCRED, sizeof_struct_ucred)
-            xid = struct.unpack('3i', ucred)[2]
+            xid = struct.unpack('3i', ucred)[1]
             caller_name = pwd.getpwuid(xid)[0]
             # Special case the genicw
             if method_name == "AdminTicket":
-                if caller_name == 'PLC_SLICE_PREFIX'+"_genicw":
+                if caller_name == PLC_SLICE_PREFIX+"_genicw":
                     try: result = method(*args)
                     except Exception, err: raise xmlrpclib.Fault(104, 'Error in call: %s' %err)
                 else:
                     raise xmlrpclib.Fault(108, '%s: Permission denied.' % caller_name)
             # Anyone can call these functions
-            elif method_name not in ('ReCreate', 'Help', 'Ticket', 'GetXIDs', 'GetSSHKeys'):
+            elif method_name not in ('Help', 'Ticket', 'GetXIDs', 'GetSSHKeys'):
                 # Authenticate the caller if not in the above fncts.
                 target_name = args[0]
                 # Gather target slice's object.