admin_socket: no sock for unprivileged daemons; rename default

Signed-off-by: Sage Weil <sage@newdream.net>

diff --git a/src/common/common_init.cc b/src/common/common_init.cc
index 0dc28dbdd7cae91171a161f0d4d4b573a867c386..2b54c102afa8f5eec94cef49fbd3369928774bd6 100644 (file)
--- a/src/common/common_init.cc
+++ b/src/common/common_init.cc
@@ -52,9 +52,9 @@ CephContext *common_preinit(const CephInitParameters &iparams,
       conf->daemonize = true;
       if (!(flags & CINIT_FLAG_UNPRIVILEGED_DAEMON_DEFAULTS)) {
        conf->set_val_or_die("pid_file", "/var/run/ceph/$type.$id.pid");
+       conf->set_val_or_die("admin_socket", "/var/run/ceph/$name.asok");
       }
       conf->set_val_or_die("log_to_stderr", STRINGIFY(LOG_TO_STDERR_SOME));
-      conf->set_val_or_die("admin_socket", "/var/run/ceph/$name.profsock");
       break;
     default:
       conf->set_val_or_die("daemonize", "false");