DEVEL15-viced-sane-acls-bit-20060802

Add VICED_CAPABILITY_SANEACLS bit and -saneacls option to viced to
enable it.

(cherry picked from commit 62e6fc36b129729a571264bfb661114dce12bc2e)

diff --git a/src/fsint/common.xg b/src/fsint/common.xg
index 3f057472e07e0c3c7af35b3b4640b64f99f0cd39..cb3b4362658e8e71aa8a721fc6e945eda32ce0f7 100644 (file)
--- a/src/fsint/common.xg
+++ b/src/fsint/common.xg
@@ -174,12 +174,13 @@ typedef afs_int32 serverList<AFSMAXCELLHOSTS>;
 typedef afs_uint32 cacheConfig<>;
 
 const AFSCAPABILITIESMAX = 196;
-typedef afs_int32 Capabilities<AFSCAPABILITIESMAX>;
+typedef afs_uint32 Capabilities<AFSCAPABILITIESMAX>;
 
 /* Viced Capability Flags */
 const VICED_CAPABILITY_ERRORTRANS      = 0x0001;
 const VICED_CAPABILITY_64BITFILES      = 0x0002;
 const VICED_CAPABILITY_WRITELOCKACL     = 0x0004;
+const VICED_CAPABILITY_SANEACLS         = 0x0008;
 
 /* Cache Manager Capability Flags */
 const CLIENT_CAPABILITY_ERRORTRANS     = 0x0001;

diff --git a/src/viced/afsfileprocs.c b/src/viced/afsfileprocs.c
index 003be6dae8f9751a27d6e6f518884def6ef1acc5..4de958b750cac4c79a6386eccd6c8c35019731fb 100644 (file)
--- a/src/viced/afsfileprocs.c
+++ b/src/viced/afsfileprocs.c
@@ -6065,6 +6065,8 @@ SRXAFS_GetCapabilities(struct rx_call * acall, Capabilities * capabilities)
 #if defined(AFS_64BIT_ENV) && defined(AFS_LARGEFILE_ENV)
     dataBuffP[0] |= VICED_CAPABILITY_64BITFILES;
 #endif
+    if (saneacls)
+       dataBuffP[0] |= VICED_CAPABILITY_SANEACLS;
 
     capabilities->Capabilities_len = dataBytes / sizeof(afs_int32);
     capabilities->Capabilities_val = dataBuffP;

diff --git a/src/viced/viced.c b/src/viced/viced.c
index c78de085a38d6096b3e5f70aebb7abcf6c12775f..4a7b8fd3f49504b9a9ddba1f1154b6361e8ab84a 100644 (file)
--- a/src/viced/viced.c
+++ b/src/viced/viced.c
@@ -200,6 +200,7 @@ int busy_threshold = 600;
 int abort_threshold = 10;
 int udpBufSize = 0;            /* UDP buffer size for receive */
 int sendBufSize = 16384;       /* send buffer size */
+int saneacls = 0;              /* Sane ACLs Flag */
 
 struct timeval tp;
 
@@ -1389,6 +1390,9 @@ ParseArgs(int argc, char *argv[])
            /* set syslog logging flag */
            mrafsStyleLogs = 1;
        } 
+       else if (strcmp(argv[i], "-saneacls") == 0) {
+           saneacls = 1;
+       }
        else {
            return (-1);
        }

diff --git a/src/viced/viced.h b/src/viced/viced.h
index d8c837cad822f5f446b8d581646776d9684f18cd..e6e08a107a3aadb50c46d4a3647ecc37693b775f 100644 (file)
--- a/src/viced/viced.h
+++ b/src/viced/viced.h
@@ -181,6 +181,7 @@ struct AFSStatistics {
 };
 
 extern int busyonrst;
+extern int saneacls;
 
 #define RESTART_ORDINARY 1
 #define RESTART_FAST 2