STABLE14-export-calleraccess-via-pioctl-20050508

FIXES 18442

provide pioctl to get CallerAccess bits

(cherry picked from commit 5afb5d6246d34948d15e93d1af9c2370d26c9f3a)

diff --git a/src/afs/afs.h b/src/afs/afs.h
index 97e27401472544633389f28598652d3b96fdcb43..dda3be8de838eff63cc5ffcd32253bede044d621 100644 (file)
--- a/src/afs/afs.h
+++ b/src/afs/afs.h
@@ -784,6 +784,13 @@ struct vcxstat {
     afs_uint32 states;
 };
 
+struct vcxstat2 {
+    afs_int32 callerAccess;
+    afs_int32 cbExpires;
+    afs_int32 anyAccess;
+    char mvstat;
+};
+
 struct sbstruct {
     int sb_thisfile;
     int sb_default;

diff --git a/src/afs/afs_pioctl.c b/src/afs/afs_pioctl.c
index 1d6a65ea056b399e8360630985a0330d18283c5b..60c851f505d75997d477070c53c0052f42d6f172 100644 (file)
--- a/src/afs/afs_pioctl.c
+++ b/src/afs/afs_pioctl.c
@@ -71,6 +71,7 @@ DECL_PIOCTL(PGetCellStatus);
 DECL_PIOCTL(PSetCellStatus);
 DECL_PIOCTL(PFlushVolumeData);
 DECL_PIOCTL(PGetVnodeXStatus);
+DECL_PIOCTL(PGetVnodeXStatus2);
 DECL_PIOCTL(PSetSysName);
 DECL_PIOCTL(PSetSPrefs);
 DECL_PIOCTL(PSetSPrefs33);
@@ -183,6 +184,7 @@ static int (*(VpioctlSw[])) () = {
        PPrefetchFromTape,      /* 66 -- MR-AFS: prefetch file from tape */
        PResidencyCmd,          /* 67 -- MR-AFS: generic commnd interface */
        PBogus,                 /* 68 -- arla: fetch stats */
+       PGetVnodeXStatus2,      /* 69 - get caller access and some vcache status */
 };
 
 static int (*(CpioctlSw[])) () = {
@@ -2640,6 +2642,8 @@ DECL_PIOCTL(PGetVnodeXStatus)
        mode = PRSFS_READ;
     if (!afs_AccessOK(avc, mode, areq, CHECK_MODE_BITS))
        return EACCES;
+
+    memset(&stat, 0, sizeof(struct vcxstat));
     stat.fid = avc->fid;
     hset32(stat.DataVersion, hgetlo(avc->m.DataVersion));
     stat.lock = avc->lock;
@@ -2670,6 +2674,36 @@ DECL_PIOCTL(PGetVnodeXStatus)
 }
 
 
+DECL_PIOCTL(PGetVnodeXStatus2)
+{
+    register afs_int32 code;
+    struct vcxstat2 stat;
+    afs_int32 mode;
+
+    if (!avc)
+        return EINVAL;
+    code = afs_VerifyVCache(avc, areq);
+    if (code)
+        return code;
+    if (vType(avc) == VDIR)
+        mode = PRSFS_LOOKUP;
+    else
+        mode = PRSFS_READ;
+    if (!afs_AccessOK(avc, mode, areq, CHECK_MODE_BITS))
+        return EACCES;
+
+    memset(&stat, 0, sizeof(struct vcxstat2));
+
+    stat.cbExpires = avc->cbExpires;
+    stat.anyAccess = avc->anyAccess;
+    stat.mvstat = avc->mvstat;
+    stat.callerAccess = afs_GetAccessBits(avc, ~0, areq);
+
+    memcpy(aout, (char *)&stat, sizeof(struct vcxstat2));
+    *aoutSize = sizeof(struct vcxstat2);
+    return 0;
+}
+
 /* We require root for local sysname changes, but not for remote */
 /* (since we don't really believe remote uids anyway) */
  /* outname[] shouldn't really be needed- this is left as an excercise */

diff --git a/src/config/venus.h b/src/config/venus.h
index f5380264f77a51eaae3a233b7591112ea0210c7a..eb5e5b880b2d72e422b4adfbb95f3b768c9fe9ed 100644 (file)
--- a/src/config/venus.h
+++ b/src/config/venus.h
@@ -175,6 +175,7 @@ struct cm_initparams {
 #define VIOC_PREFETCHTAPE       _VICEIOCTL(66) /* MR-AFS prefetch from tape */
 #define VIOC_RESIDENCY_CMD      _VICEIOCTL(67) /* generic MR-AFS cmds */
 #define VIOC_STATISTICS         _VICEIOCTL(68) /* arla: fetch statistics */
+#define VIOC_GETVCXSTATUS2      _VICEIOCTL(69)  /* vcache statistics */
 
 /* Coordinated 'C' pioctl's */
 #define VIOC_NEWALIAS          _CVICEIOCTL(1)  /* create new cell alias */

diff --git a/src/venus/fs.c b/src/venus/fs.c
index d7ba1823a48fba8c65be54197e66b05f2dcd98f9..2be9d24d2891c59c00316442262eddbf450240c7 100644 (file)
--- a/src/venus/fs.c
+++ b/src/venus/fs.c
@@ -112,6 +112,13 @@ struct AclEntry {
     afs_int32 rights;
 };
 
+struct vcxstat2 {
+    afs_int32 callerAccess;
+    afs_int32 cbExpires;
+    afs_int32 anyAccess;
+    char mvstat;
+};
+
 static void
 ZapAcl(acl)
      struct Acl *acl;
@@ -1188,6 +1195,33 @@ ListACLCmd(struct cmd_syndesc *as, char *arock)
     return error;
 }
 
+static int
+GetCallerAccess(struct cmd_syndesc *as, char *arock)
+{
+    struct cmd_item *ti;
+    int error = 0;
+
+    SetDotDefault(&as->parms[0].items);
+    for (ti = as->parms[0].items; ti; ti = ti->next) {
+        afs_int32 code;
+        struct ViceIoctl blob;
+        struct vcxstat2 stat;
+        blob.out_size = sizeof(struct vcxstat2);
+        blob.in_size = 0;
+        blob.out = &stat;
+        code = pioctl(ti->data, VIOC_GETVCXSTATUS2, &blob, 1);
+        if (code) {
+            Die(errno, ti->data);
+            error = 1;
+            continue;
+        }
+        printf("Callers access to %s is ", ti->data);
+        PRights(stat.callerAccess, 0);
+        printf("\n");
+    }
+    return error;
+}
+
 static int
 FlushVolumeCmd(struct cmd_syndesc *as, char *arock)
 {
@@ -3172,6 +3206,11 @@ main(int argc, char **argv)
     cmd_AddParm(ts, "-if", CMD_FLAG, CMD_OPTIONAL, "initial file acl");
     cmd_CreateAlias(ts, "la");
 
+    ts = cmd_CreateSyntax("getcalleraccess", GetCallerAccess, 0,
+            "list callers access");
+    cmd_AddParm(ts, "-path", CMD_LIST, CMD_OPTIONAL, "dir/file path");
+    cmd_CreateAlias(ts, "gca");
+
     ts = cmd_CreateSyntax("cleanacl", CleanACLCmd, 0,
                          "clean up access control list");
     cmd_AddParm(ts, "-path", CMD_LIST, CMD_OPTIONAL, "dir/file path");