From 673dcc95e147596b8f31c3ad2532d30994f78399 Mon Sep 17 00:00:00 2001 From: Russ Allbery Date: Fri, 27 Jun 2008 21:50:38 -0700 Subject: [PATCH] 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. --- debian/patches/bos-permissions | 24 ------------------------ src/bozo/bosoprocs.c | 4 ++-- 2 files changed, 2 insertions(+), 26 deletions(-) delete mode 100644 debian/patches/bos-permissions diff --git a/debian/patches/bos-permissions b/debian/patches/bos-permissions deleted file mode 100644 index 0dace41dd..000000000 --- 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 ec9e1e476..65c4d12b5 100644 --- 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 */ -- 2.39.5