Tweak the expected configuration directory permissions

Apply quilt patch bos-permissions: Expect the server directory to be
mode 0700 since that's where the AFS KeyFile is stored.  Allow the
local directory to be mode 0755, since there's no reason for it to be
more restrictive.

Allowing the server directory to be mode 0700 causes problems upstream if
people symlink the client configuration to the server directory, which is
recommended by some documentation, so this is not applied upstream.

diff --git a/debian/patches/bos-permissions b/debian/patches/bos-permissions
deleted file mode 100644 (file)
index 0dace41..0000000
--- a/debian/patches/bos-permissions
+++ /dev/null
@@ -1,24 +0,0 @@
-Expect the server directory to be mode 0700 since that's where the AFS
-KeyFile is stored.  Allow the local directory to be mode 0755, since
-there's no reason for it to be more restrictive.  Allowing the server
-directory to be mode 0700 causes problems upstream if people symlink the
-client configuration to the server directory, which is recommended by
-some documentation.
-
---- openafs.orig/src/bozo/bosoprocs.c
-+++ openafs/src/bozo/bosoprocs.c
-@@ -1317,12 +1317,12 @@
- 
- struct bozo_bosEntryStats bozo_bosEntryStats[] = {
-     {NULL, 1, 1, 0755, 02},   /* AFSDIR_SERVER_AFS_DIRPATH    */
--    {NULL, 1, 1, 0755, 02},   /* AFSDIR_SERVER_ETC_DIRPATH    */
-+    {NULL, 1, 1, 0700, 02},   /* AFSDIR_SERVER_ETC_DIRPATH    */
-     {NULL, 1, 1, 0755, 02},   /* AFSDIR_SERVER_BIN_DIRPATH    */
-     {NULL, 1, 1, 0755, 02},   /* AFSDIR_SERVER_LOGS_DIRPATH   */
-     {NULL, 1, 0, 0700, 07},   /* AFSDIR_SERVER_BACKUP_DIRPATH */
-     {NULL, 1, 1, 0700, 07},   /* AFSDIR_SERVER_DB_DIRPATH     */
--    {NULL, 1, 1, 0700, 07},   /* AFSDIR_SERVER_LOCAL_DIRPATH  */
-+    {NULL, 1, 1, 0700, 02},   /* AFSDIR_SERVER_LOCAL_DIRPATH  */
-     {NULL, 0, 1, 0600, 07},   /* AFSDIR_SERVER_KEY_FILEPATH   */
-     {NULL, 0, 1, 0600, 03}
- };                            /* AFSDIR_SERVER_ULIST_FILEPATH */

diff --git a/src/bozo/bosoprocs.c b/src/bozo/bosoprocs.c
index ec9e1e47699833b91794d68af2287f10134f6a98..65c4d12b5155de7587ced9ac6038f41b16637911 100644 (file)
--- a/src/bozo/bosoprocs.c
+++ b/src/bozo/bosoprocs.c
@@ -1317,12 +1317,12 @@ SBOZO_EnumerateInstance(acall, anum, ainstance)
 
 struct bozo_bosEntryStats bozo_bosEntryStats[] = {
     {NULL, 1, 1, 0755, 02},    /* AFSDIR_SERVER_AFS_DIRPATH    */
-    {NULL, 1, 1, 0755, 02},    /* AFSDIR_SERVER_ETC_DIRPATH    */
+    {NULL, 1, 1, 0700, 02},    /* AFSDIR_SERVER_ETC_DIRPATH    */
     {NULL, 1, 1, 0755, 02},    /* AFSDIR_SERVER_BIN_DIRPATH    */
     {NULL, 1, 1, 0755, 02},    /* AFSDIR_SERVER_LOGS_DIRPATH   */
     {NULL, 1, 0, 0700, 07},    /* AFSDIR_SERVER_BACKUP_DIRPATH */
     {NULL, 1, 1, 0700, 07},    /* AFSDIR_SERVER_DB_DIRPATH     */
-    {NULL, 1, 1, 0700, 07},    /* AFSDIR_SERVER_LOCAL_DIRPATH  */
+    {NULL, 1, 1, 0700, 02},    /* AFSDIR_SERVER_LOCAL_DIRPATH  */
     {NULL, 0, 1, 0600, 07},    /* AFSDIR_SERVER_KEY_FILEPATH   */
     {NULL, 0, 1, 0600, 03}
 };                             /* AFSDIR_SERVER_ULIST_FILEPATH */