X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=api.py;h=350cb25903e1997c0874c0c356e4b9be1656d84c;hb=1f2d461854b7c822baa1a31a54595e15dadc6128;hp=0e51ba3cfe698617c5e74b4a883e99e9fd6b0e32;hpb=85c55d2994fa59ee82327edb57bfae01227464bd;p=nodemanager.git

diff --git a/api.py b/api.py
index 0e51ba3..350cb25 100644
--- a/api.py
+++ b/api.py
@@ -62,7 +62,7 @@ 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":
@@ -74,13 +74,19 @@ class APIRequestHandler(SimpleXMLRPCServer.SimpleXMLRPCRequestHandler):
             # Anyone can call these functions
             elif method_name not in ('Help', 'Ticket', 'GetXIDs', 'GetSSHKeys'):
                 # Authenticate the caller if not in the above fncts.
-                target_name = args[0]
+                if method_name == "GetRecord":
+                    target_name = caller_name
+                else:
+                    target_name = args[0]
+
                 # Gather target slice's object.
                 target_rec = database.db.get(target_name)
-                # only work on slivers.  Sannity check.
+
+                # only work on slivers or self.  Sannity check.
                 if not (target_rec and target_rec['type'].startswith('sliver.')): 
                     raise xmlrpclib.Fault(102, \
                         'Invalid argument: the first argument must be a sliver name.')
+
                 # only manipulate slivers who delegate you authority 
                 if caller_name in (target_name, target_rec['delegations']):
                     try: result = method(target_rec, *args[1:])