From 8f645befba4c1c5df9c6f4ef832d217b1fdfed76 Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 5 Nov 2014 14:09:59 -0500
Subject: [PATCH] 11291: Fix warnings, add changes file, rename 'mask'.

---
 changes/ticket-11291     |  4 ++++
 src/common/util.c        | 11 +++++------
 src/test/test_checkdir.c |  1 +
 3 files changed, 10 insertions(+), 6 deletions(-)
 create mode 100644 changes/ticket-11291

diff --git a/changes/ticket-11291 b/changes/ticket-11291
new file mode 100644
index 0000000000..4c19f3cd0e
--- /dev/null
+++ b/changes/ticket-11291
@@ -0,0 +1,4 @@
+  o Minor features (hidden services):
+    - New HiddenServiceDirGroupReadable option to cause hidden service
+      directories and hostname files to be created group-readable.
+      Patch from "anon", David Stainton, and "meejah".
diff --git a/src/common/util.c b/src/common/util.c
index b616d1f389..50097dac93 100644
--- a/src/common/util.c
+++ b/src/common/util.c
@@ -2012,8 +2012,7 @@ check_private_dir(const char *dirname, cpd_check_t check,
   struct stat st;
   char *f;
 #ifndef _WIN32
-  int mask = 0;
-  int perm = 0;
+  unsigned unwanted_bits = 0;
   const struct passwd *pw = NULL;
   uid_t running_uid;
   gid_t running_gid;
@@ -2112,11 +2111,11 @@ check_private_dir(const char *dirname, cpd_check_t check,
     return -1;
   }
   if (check & (CPD_GROUP_OK|CPD_GROUP_READ)) {
-    mask = 0027;
+    unwanted_bits = 0027;
   } else {
-    mask = 0077;
+    unwanted_bits = 0077;
   }
-  if (st.st_mode & mask) {
+  if ((st.st_mode & unwanted_bits) != 0) {
     unsigned new_mode;
     if (check & CPD_CHECK_MODE_ONLY) {
       log_warn(LD_FS, "Permissions on directory %s are too permissive.",
@@ -2129,7 +2128,7 @@ check_private_dir(const char *dirname, cpd_check_t check,
     if (check & CPD_GROUP_READ) {
       new_mode |= 0050; /* Group should have rx */
     }
-    new_mode &= ~mask; /* Clear the other bits that we didn't want set...*/
+    new_mode &= ~unwanted_bits; /* Clear the bits that we didn't want set...*/
     if (chmod(dirname, new_mode)) {
       log_warn(LD_FS, "Could not chmod directory %s: %s", dirname,
                strerror(errno));
diff --git a/src/test/test_checkdir.c b/src/test/test_checkdir.c
index 7bf735e061..409ba80004 100644
--- a/src/test/test_checkdir.c
+++ b/src/test/test_checkdir.c
@@ -12,6 +12,7 @@
 static void
 test_checkdir_perms(void *testdata)
 {
+  (void)testdata;
   or_options_t *options = get_options_mutable();
   const char *subdir = "test_checkdir";
   char *testdir;