X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/python-afs.git/blobdiff_plain/08c48856a689af67af5675b2ded99789fb8ca4d3..62df45819cdcbd21b579a471c821f0876743b2a4:/afs/_pts.pyx

diff --git a/afs/_pts.pyx b/afs/_pts.pyx
index 66fefd9..c4e4dcf 100644
--- a/afs/_pts.pyx
+++ b/afs/_pts.pyx
@@ -2,7 +2,7 @@ from afs cimport *
 
 cdef class PTS:
     cdef ubik_client * client
-    
+
     def __cinit__(self, cell=None, sec=1):
         cdef afs_int32 code
         cdef afsconf_dir *cdir
@@ -11,18 +11,20 @@ cdef class PTS:
         cdef ktc_principal prin
         cdef ktc_token token
         cdef rx_securityClass *sc
-        
+        cdef rx_connection *serverconns[MAXSERVERS]
+        cdef int i
+
         if cell is None:
             c_cell = NULL
         else:
             c_cell = cell
-        
+
         self.client = NULL
-        
+
         code = rx_Init(0)
         if code != 0:
             raise Exception(code, "Error initializing Rx")
-        
+
         cdir = afsconf_Open(AFSDIR_CLIENT_ETC_DIRPATH)
         if cdir is NULL:
             raise OSError(errno,
@@ -30,18 +32,18 @@ cdef class PTS:
                               (AFSDIR_CLIENT_ETC_DIRPATH, strerror(errno)))
         code = afsconf_GetCellInfo(cdir, c_cell, "afsprot", &info)
         if code != 0:
-            raise Exception(code, "GetCellInfo: %s" % error_message(code))
-        
+            raise Exception(code, "GetCellInfo: %s" % afs_error_message(code))
+
         if sec > 0:
             strncpy(prin.cell, info.name, sizeof(prin.cell))
             prin.instance[0] = 0
             strncpy(prin.name, "afs", sizeof(prin.name))
-            
+
             code = ktc_GetToken(&prin, &token, sizeof(token), NULL);
             if code != 0:
                 if sec >= 2:
                     # No really - we wanted authentication
-                    raise Exception(code, "Failed to get token for service AFS: %s" % error_message(code))
+                    raise Exception(code, "Failed to get token for service AFS: %s" % afs_error_message(code))
                 sec = 0
             else:
                 if sec == 3:
@@ -51,13 +53,26 @@ cdef class PTS:
                 sc = rxkad_NewClientSecurityObject(level, &token.sessionKey,
                                                    token.kvno, token.ticketLen,
                                                    token.ticket)
-        
+
         if sec == 0:
             sc = rxnull_NewClientSecurityObject()
         else:
             sec = 2
-        
+
+        memset(serverconns, 0, sizeof(serverconns))
+        for 0 <= i < info.numServers:
+            serverconns[i] = rx_NewConnection(info.hostAddr[i].sin_addr.s_addr,
+                                              info.hostAddr[i].sin_port,
+                                              PRSRV,
+                                              sc,
+                                              sec)
+
+        code = ubik_ClientInit(serverconns, &self.client)
+        if code != 0:
+            raise Exception("Failed to initialize ubik connection to Protection server: %s" % afs_error_message(code))
+
         code = rxs_Release(sc)
-    
+
     def __dealloc__(self):
+        ubik_ClientDestroy(self.client)
         rx_Finalize()