X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/python-afs.git/blobdiff_plain/0de77457daaf0855fc5f87cc5cbd3be40f024d9a..a589b6a78351509326cd03bc790c271de31e7914:/afs/_pts.pyx diff --git a/afs/_pts.pyx b/afs/_pts.pyx index 56292cd..eb62c08 100644 --- a/afs/_pts.pyx +++ b/afs/_pts.pyx @@ -70,7 +70,6 @@ cdef import from "afs/ptuser.h": cdef import from "afs/pterror.h": enum: PRNOENT - PRTOOMANY cdef class PTEntry: cdef public afs_int32 flags @@ -134,6 +133,7 @@ cdef class PTS: server """ cdef ubik_client * client + cdef readonly object cell def __cinit__(self, cell=None, sec=1): cdef afs_int32 code @@ -167,6 +167,8 @@ cdef class PTS: code = afsconf_GetCellInfo(cdir, c_cell, "afsprot", &info) pyafs_error(code) + self.cell = info.name + if sec > 0: strncpy(prin.cell, info.name, sizeof(prin.cell)) prin.instance[0] = 0 @@ -209,18 +211,18 @@ cdef class PTS: ubik_ClientDestroy(self.client) rx_Finalize() - def NameOrId(self, ident): + def _NameOrId(self, ident): """ Given an identifier, convert it to a PTS ID by looking up the name if it's a string, or otherwise just converting it to an integer. """ if isinstance(ident, (str, unicode)): - return self.NameToId(ident) + return self._NameToId(ident) else: return int(ident) - def NameToId(self, name): + def _NameToId(self, name): """ Converts a user or group to an AFS ID. """ @@ -243,7 +245,7 @@ cdef class PTS: pyafs_error(code) return id - def IdToName(self, id): + def _IdToName(self, id): """ Convert an AFS ID to the name of a user or group. """ @@ -268,7 +270,7 @@ cdef class PTS: pyafs_error(code) return name - def CreateUser(self, name, id=None): + def _CreateUser(self, name, id=None): """ Create a new user in the protection database. If an ID is provided, that one will be used. @@ -288,7 +290,7 @@ cdef class PTS: pyafs_error(code) return cid - def CreateGroup(self, name, owner, id=None): + def _CreateGroup(self, name, owner, id=None): """ Create a new group in the protection database. If an ID is provided, that one will be used. @@ -296,7 +298,7 @@ cdef class PTS: cdef afs_int32 code, cid name = name[:PR_MAXNAMELEN].lower() - oid = self.NameOrId(owner) + oid = self._NameOrId(owner) if id is not None: cid = id @@ -307,38 +309,38 @@ cdef class PTS: pyafs_error(code) return cid - def Delete(self, ident): + def _Delete(self, ident): """ Delete the protection database entry with the provided identifier. """ cdef afs_int32 code - cdef afs_int32 id = self.NameOrId(ident) + cdef afs_int32 id = self._NameOrId(ident) code = ubik_PR_Delete(self.client, 0, id) pyafs_error(code) - def AddToGroup(self, user, group): + def _AddToGroup(self, user, group): """ Add the given user to the given group. """ cdef afs_int32 code - cdef afs_int32 uid = self.NameOrId(user), gid = self.NameOrId(group) + cdef afs_int32 uid = self._NameOrId(user), gid = self._NameOrId(group) code = ubik_PR_AddToGroup(self.client, 0, uid, gid) pyafs_error(code) - def RemoveFromGroup(self, user, group): + def _RemoveFromGroup(self, user, group): """ Remove the given user from the given group. """ cdef afs_int32 code - cdef afs_int32 uid = self.NameOrId(user), gid = self.NameOrId(group) + cdef afs_int32 uid = self._NameOrId(user), gid = self._NameOrId(group) code = ubik_PR_RemoveFromGroup(self.client, 0, uid, gid) pyafs_error(code) - def ListMembers(self, ident): + def _ListMembers(self, ident): """ Get the membership of an entity. @@ -355,7 +357,7 @@ cdef class PTS: cdef int i cdef object members = [] - cdef afs_int32 id = self.NameOrId(ident) + cdef afs_int32 id = self._NameOrId(ident) alist.prlist_len = 0 alist.prlist_val = NULL @@ -367,13 +369,11 @@ cdef class PTS: members.append(alist.prlist_val[i]) free(alist.prlist_val) - if over: - code = PRTOOMANY pyafs_error(code) return members - def ListOwned(self, owner): + def _ListOwned(self, owner): """ Get all groups owned by an entity. """ @@ -382,7 +382,7 @@ cdef class PTS: cdef int i cdef object owned = [] - cdef afs_int32 oid = self.NameOrId(owner) + cdef afs_int32 oid = self._NameOrId(owner) alist.prlist_len = 0 alist.prlist_val = NULL @@ -394,13 +394,11 @@ cdef class PTS: owned.append(alist.prlist_val[i]) free(alist.prlist_val) - if over: - code = PRTOOMANY pyafs_error(code) return owned - def ListEntry(self, ident): + def _ListEntry(self, ident): """ Load a PTEntry instance with information about the provided entity. @@ -409,7 +407,7 @@ cdef class PTS: cdef prcheckentry centry cdef object entry = PTEntry() - cdef afs_int32 id = self.NameOrId(ident) + cdef afs_int32 id = self._NameOrId(ident) code = ubik_PR_ListEntry(self.client, 0, id, ¢ry) pyafs_error(code) @@ -417,7 +415,7 @@ cdef class PTS: _ptentry_from_c(entry, ¢ry) return entry - def ChangeEntry(self, ident, newname=None, newid=None, newoid=None): + def _ChangeEntry(self, ident, newname=None, newid=None, newoid=None): """ Change the name, ID, and/or owner of a PTS entity. @@ -428,10 +426,10 @@ cdef class PTS: cdef afs_int32 c_newid = 0, c_newoid = 0 cdef char * c_newname - cdef afs_int32 id = self.NameOrId(ident) + cdef afs_int32 id = self._NameOrId(ident) if newname is None: - newname = self.IdToName(id) + newname = self._IdToName(id) c_newname = newname if newid is not None: c_newid = newid @@ -441,21 +439,21 @@ cdef class PTS: code = ubik_PR_ChangeEntry(self.client, 0, id, c_newname, c_newoid, c_newid) pyafs_error(code) - def IsAMemberOf(self, user, group): + def _IsAMemberOf(self, user, group): """ Return True if the given user is a member of the given group. """ cdef afs_int32 code cdef afs_int32 flag - cdef afs_int32 uid = self.NameOrId(user), gid = self.NameOrId(group) + cdef afs_int32 uid = self._NameOrId(user), gid = self._NameOrId(group) code = ubik_PR_IsAMemberOf(self.client, 0, uid, gid, &flag) pyafs_error(code) return bool(flag) - def ListMax(self): + def _ListMax(self): """ Return a tuple of the maximum user ID and the maximum group ID currently assigned. @@ -467,7 +465,7 @@ cdef class PTS: return (uid, gid) - def SetMaxUserId(self, id): + def _SetMaxUserId(self, id): """ Set the maximum currently assigned user ID (the next automatically assigned UID will be id + 1) @@ -477,7 +475,7 @@ cdef class PTS: code = ubik_PR_SetMax(self.client, 0, id, 0) pyafs_error(code) - def SetMaxGroupId(self, id): + def _SetMaxGroupId(self, id): """ Set the maximum currently assigned user ID (the next automatically assigned UID will be id + 1) @@ -487,7 +485,7 @@ cdef class PTS: code = ubik_PR_SetMax(self.client, 0, id, PRGRP) pyafs_error(code) - def ListEntries(self, users=None, groups=None): + def _ListEntries(self, users=None, groups=None): """ Return a list of PTEntry instances representing all entries in the PRDB. @@ -525,7 +523,7 @@ cdef class PTS: return entries - def SetFields(self, ident, access=None, groups=None, users=None): + def _SetFields(self, ident, access=None, groups=None, users=None): """ Update the fields for an entry. @@ -537,7 +535,7 @@ cdef class PTS: cdef afs_int32 code cdef afs_int32 mask = 0, flags = 0, nusers = 0, ngroups = 0 - cdef afs_int32 id = self.NameOrId(ident) + cdef afs_int32 id = self._NameOrId(ident) if access is not None: flags = access