From: Evan Broder Date: Sun, 15 Mar 2009 03:38:31 +0000 (-0400) Subject: Apparently every time you write trailing spaces, God kills a kitten X-Git-Tag: 0.1.0~76 X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/python-afs.git/commitdiff_plain/62df45819cdcbd21b579a471c821f0876743b2a4 Apparently every time you write trailing spaces, God kills a kitten Signed-off-by: Evan Broder --- diff --git a/afs/_pts.pyx b/afs/_pts.pyx index 8a5751c..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 @@ -13,18 +13,18 @@ cdef class PTS: 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, @@ -33,12 +33,12 @@ cdef class PTS: code = afsconf_GetCellInfo(cdir, c_cell, "afsprot", &info) if code != 0: 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: @@ -53,12 +53,12 @@ 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, @@ -66,13 +66,13 @@ cdef class PTS: 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() diff --git a/afs/afs.pxd b/afs/afs.pxd index 057c2a7..1542de2 100644 --- a/afs/afs.pxd +++ b/afs/afs.pxd @@ -30,12 +30,12 @@ cdef extern from "afs/cellconfig.h": MAXCELLCHARS MAXHOSTSPERCELL MAXHOSTCHARS - + # We just pass afsconf_dir structs around to other AFS functions, # so this can be treated as opaque struct afsconf_dir: pass - + # For afsconf_cell, on the other hand, we care about everything struct afsconf_cell: char name[MAXCELLCHARS] @@ -45,7 +45,7 @@ cdef extern from "afs/cellconfig.h": char hostName[MAXHOSTSPERCELL][MAXHOSTCHARS] char *linkedCell int timeout - + afsconf_dir *afsconf_Open(char *adir) int afsconf_GetCellInfo(afsconf_dir *adir, char *acellName, @@ -54,15 +54,15 @@ cdef extern from "afs/cellconfig.h": cdef extern from "rx/rxkad.h": ctypedef char rxkad_level - + enum: MAXKTCNAMELEN MAXKTCREALMLEN - + enum: rxkad_clear rxkad_crypt - + struct ktc_encryptionKey: pass @@ -70,26 +70,26 @@ cdef extern from "rx/rxkad.h": char name[MAXKTCNAMELEN] char instance[MAXKTCNAMELEN] char cell[MAXKTCREALMLEN] - + struct rx_securityClass: pass - + rx_securityClass *rxkad_NewClientSecurityObject(rxkad_level level, ktc_encryptionKey *sessionKey, afs_int32 kvno, int ticketLen, char *ticket) rx_securityClass *rxnull_NewClientSecurityObject() - + int rxs_Release(rx_securityClass *aobj) cdef extern from "rx/rx.h": int rx_Init(int port) void rx_Finalize() - + struct rx_connection: pass - + rx_connection *rx_NewConnection(afs_uint32 shost, unsigned short sport, unsigned short sservice, @@ -99,13 +99,13 @@ cdef extern from "rx/rx.h": cdef extern from "afs/auth.h": enum: MAXKTCTICKETLEN - + struct ktc_token: ktc_encryptionKey sessionKey short kvno int ticketLen char ticket[MAXKTCTICKETLEN] - + int ktc_GetToken(ktc_principal *server, ktc_token *token, int tokenLen, @@ -118,11 +118,11 @@ cdef extern from "afs/prclient.h": cdef extern from "ubik.h": enum: MAXSERVERS - + # ubik_client is an opaque struct, so we don't care about its members struct ubik_client: pass - + int ubik_ClientInit(rx_connection **serverconns, ubik_client **aclient) afs_int32 ubik_ClientDestroy(ubik_client *aclient)