From: Owen Synge <osynge@suse.com>
Date: Wed, 2 Mar 2016 11:15:48 +0000 (+0100)
Subject: keyring permissions for mon daemon
X-Git-Tag: v0.94.7~11^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d4cf19049349678065195659bb287b899f92a686;p=ceph.git

keyring permissions for mon daemon

The command:

sudo ceph-mon --cluster ceph --mkfs -i $NODE_NAME --keyring $PATH_MON_KEYRING

Writes a new keyring with permissions set to "0644".

Fixes: #14950
Signed-off-by: Owen Synge osynge@suse.com
(cherry picked from commit c2f91a8ce46974a72b960b7cb25af3d089fbb80d)
---

diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index d62d7cf1e1cc..53d3bcdeb94b 100644
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -4546,7 +4546,7 @@ int Monitor::write_default_keyring(bufferlist& bl)
   os << g_conf->mon_data << "/keyring";
 
   int err = 0;
-  int fd = ::open(os.str().c_str(), O_WRONLY|O_CREAT, 0644);
+  int fd = ::open(os.str().c_str(), O_WRONLY|O_CREAT, 0600);
   if (fd < 0) {
     err = -errno;
     dout(0) << __func__ << " failed to open " << os.str()