X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/python-afs.git/blobdiff_plain/d5d127185323d91a26c04b505ef619287bbd7761..5a7fc7f433837c0fec1d26568d42710d1f1e9bd5:/afs/_pts.pyx

diff --git a/afs/_pts.pyx b/afs/_pts.pyx
index ba3da9f..8a8937c 100644
--- a/afs/_pts.pyx
+++ b/afs/_pts.pyx
@@ -7,6 +7,9 @@ cdef import from "afs/ptuser.h":
         PRUSERS
         PRGROUPS
         ANONYMOUSID
+        PR_SF_ALLBITS
+        PR_SF_NGROUPS
+        PR_SF_NUSERS
 
     ctypedef char prname[PR_MAXNAMELEN]
 
@@ -30,6 +33,7 @@ cdef import from "afs/ptuser.h":
         afs_int32 ngroups
         afs_int32 nusers
         afs_int32 count
+        char name[PR_MAXNAMELEN]
 
     struct prlistentries:
         afs_int32 flags
@@ -39,6 +43,7 @@ cdef import from "afs/ptuser.h":
         afs_int32 ngroups
         afs_int32 nusers
         afs_int32 count
+        char name[PR_MAXNAMELEN]
 
     struct prentries:
         unsigned int prentries_len
@@ -59,6 +64,7 @@ cdef import from "afs/ptuser.h":
     int ubik_PR_ListMax(ubik_client *, afs_int32, afs_int32 *, afs_int32 *)
     int ubik_PR_SetMax(ubik_client *, afs_int32, afs_int32, afs_int32)
     int ubik_PR_ListEntries(ubik_client *, afs_int32, afs_int32, afs_int32, prentries *, afs_int32 *)
+    int ubik_PR_SetFieldsEntry(ubik_client *, afs_int32, afs_int32, afs_int32, afs_int32, afs_int32, afs_int32, afs_int32, afs_int32)
 
 cdef import from "afs/pterror.h":
     enum:
@@ -75,36 +81,15 @@ cdef class PTEntry:
     cdef public afs_int32 ngroups
     cdef public afs_int32 nusers
     cdef public afs_int32 count
+    cdef public object name
 
-cdef int _ptentry_from_checkentry(PTEntry p_entry, prcheckentry c_entry) except -1:
-    if p_entry is None:
-        raise TypeError
-        return -1
-
-    p_entry.flags = c_entry.flags
-    p_entry.id = c_entry.id
-    p_entry.owner = c_entry.owner
-    p_entry.creator = c_entry.creator
-    p_entry.ngroups = c_entry.ngroups
-    p_entry.nusers = c_entry.nusers
-    p_entry.count = c_entry.count
-    return 0
-
-cdef int _ptentry_to_checkentry(prcheckentry * c_entry, PTEntry p_entry) except -1:
-    if p_entry is None:
-        raise TypeError
-        return -1
-
-    c_entry.flags = p_entry.flags
-    c_entry.id = p_entry.id
-    c_entry.owner = p_entry.owner
-    c_entry.creator = p_entry.creator
-    c_entry.ngroups = p_entry.ngroups
-    c_entry.nusers = p_entry.nusers
-    c_entry.count = p_entry.count
-    return 0
+    def __repr__(self):
+        if self.name != '':
+            return '<PTEntry: %s>' % self.name
+        else:
+            return '<PTEntry: PTS ID %s>' % self.id
 
-cdef int _ptentry_from_listentry(PTEntry p_entry, prlistentries c_entry) except -1:
+cdef int _ptentry_from_c(PTEntry p_entry, prcheckentry * c_entry) except -1:
     if p_entry is None:
         raise TypeError
         return -1
@@ -116,9 +101,10 @@ cdef int _ptentry_from_listentry(PTEntry p_entry, prlistentries c_entry) except
     p_entry.ngroups = c_entry.ngroups
     p_entry.nusers = c_entry.nusers
     p_entry.count = c_entry.count
+    p_entry.name = c_entry.name
     return 0
 
-cdef int _ptentry_to_listentry(prlistentries * c_entry, PTEntry p_entry) except -1:
+cdef int _ptentry_to_c(prcheckentry * c_entry, PTEntry p_entry) except -1:
     if p_entry is None:
         raise TypeError
         return -1
@@ -130,6 +116,7 @@ cdef int _ptentry_to_listentry(prlistentries * c_entry, PTEntry p_entry) except
     c_entry.ngroups = p_entry.ngroups
     c_entry.nusers = p_entry.nusers
     c_entry.count = p_entry.count
+    strncpy(c_entry.name, p_entry.name, sizeof(c_entry.name))
     return 0
 
 cdef class PTS:
@@ -225,6 +212,17 @@ cdef class PTS:
         ubik_ClientDestroy(self.client)
         rx_Finalize()
 
+    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)
+        else:
+            return int(ident)
+
     def NameToId(self, name):
         """
         Converts a user or group to an AFS ID.
@@ -419,7 +417,7 @@ cdef class PTS:
         if code != 0:
             raise Exception("Error getting entity info: %s" % afs_error_message(code))
 
-        _ptentry_from_checkentry(entry, centry)
+        _ptentry_from_c(entry, &centry)
         return entry
 
     def ChangeEntry(self, id, newname=None, newid=None, newoid=None):
@@ -522,7 +520,7 @@ cdef class PTS:
             if centries.prentries_val is not NULL:
                 for i in range(centries.prentries_len):
                     e = PTEntry()
-                    _ptentry_from_listentry(e, centries.prentries_val[i])
+                    _ptentry_from_c(e, <prcheckentry *>&centries.prentries_val[i])
                     entries.append(e)
                 free(centries.prentries_val)
             if code != 0:
@@ -531,3 +529,29 @@ cdef class PTS:
             startindex = nextstartindex
 
         return entries
+
+    def SetFields(self, id, access=None, groups=None, users=None):
+        """
+        Update the fields for an entry.
+
+        Valid fields are the privacy flags (access), the group quota
+        (groups), or the "foreign user quota" (users), which doesn't
+        actually seem to do anything, but is included for
+        completeness.
+        """
+        cdef afs_int32 code
+        cdef afs_int32 mask = 0, flags = 0, nusers = 0, ngroups = 0
+
+        if access is not None:
+            flags = access
+            mask |= PR_SF_ALLBITS
+        if groups is not None:
+            ngroups = groups
+            mask |= PR_SF_NGROUPS
+        if users is not None:
+            nusers = users
+            mask |= PR_SF_NGROUPS
+
+        code = ubik_PR_SetFieldsEntry(self.client, 0, id, mask, flags, ngroups, nusers, 0, 0)
+        if code != 0:
+            raise Exception("Unable to set fields: %s" % afs_error_message(code))