From 4a48e7a028a8636541b7ae146e703086d06d30c6 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Mon, 25 Jul 2011 13:48:56 -0700
Subject: [PATCH] admin_socket: no sock for unprivileged daemons; rename
 default

Signed-off-by: Sage Weil <sage@newdream.net>
---
 src/common/common_init.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common/common_init.cc b/src/common/common_init.cc
index 0dc28dbdd7cae..2b54c102afa8f 100644
--- 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");
-- 
2.39.5