auth: rename supported_auth -> auth_supported

It should be 'auth supported' for naming consistency.

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

diff --git a/src/auth/AuthSupported.cc b/src/auth/AuthSupported.cc
index 65c1d3c13426e46bd066b4e6eb28ad0aefffae25..9cab32db1a5dbb59b6ad7add1c4236ffe4e196c7 100644 (file)
--- a/src/auth/AuthSupported.cc
+++ b/src/auth/AuthSupported.cc
@@ -24,7 +24,7 @@ static map<int, bool> auth_supported;
 
 static void _init_supported(void)
 {
-  string str = g_conf.supported_auth;
+  string str = g_conf.auth_supported;
   list<string> sup_list;
   get_str_list(str, sup_list);
   for (list<string>::iterator iter = sup_list.begin(); iter != sup_list.end(); ++iter) {

diff --git a/src/config.cc b/src/config.cc
index f6eaee3d4a872aa432562afddf80bb6f23270ae5..58665a6d901ddf55bc9b2ff6d5ac57d89abe9de9 100644 (file)
--- a/src/config.cc
+++ b/src/config.cc
@@ -304,7 +304,6 @@ static struct config_option config_optionsp[] = {
        OPTION(key, 0, OPT_STR, ""),
        OPTION(keyfile, 'K', OPT_STR, ""),
        OPTION(keyring, 'k', OPT_STR, "~/.ceph/keyring.bin, /etc/ceph/keyring.bin, .ceph_keyring"),
-       OPTION(supported_auth, 0, OPT_STR, "none"),
        OPTION(clock_lock, 0, OPT_BOOL, false),
        OPTION(clock_tare, 0, OPT_BOOL, false),
        OPTION(ms_tcp_nodelay, 0, OPT_BOOL, true),
@@ -334,6 +333,7 @@ static struct config_option config_optionsp[] = {
        OPTION(mon_globalid_prealloc, 0, OPT_INT, 100),   // how many globalids to prealloc
        OPTION(paxos_propose_interval, 0, OPT_DOUBLE, 1.0),  // gather updates for this long before proposing a map update
        OPTION(paxos_observer_timeout, 0, OPT_DOUBLE, 5*60), // gather updates for this long before proposing a map update
+       OPTION(auth_supported, 0, OPT_STR, "none"),
        OPTION(auth_mon_ticket_ttl, 0, OPT_DOUBLE, 60*60*12),
        OPTION(auth_service_ticket_ttl, 0, OPT_DOUBLE, 60*60),
        OPTION(auth_nonce_len, 0, OPT_INT, 16),

diff --git a/src/config.h b/src/config.h
index c13f9bd2d1cb531ad9fd7dd608685db066b4182b..0b9812a733ce6c9c54a9e7d3da32054d8d52a3fa 100644 (file)
--- a/src/config.h
+++ b/src/config.h
@@ -120,7 +120,6 @@ struct md_config_t {
   char *key;
   char *keyfile;
   char *keyring;
-  char *supported_auth;
 
   // messenger
 
@@ -165,6 +164,7 @@ struct md_config_t {
   double paxos_observer_timeout;
 
   // auth
+  char *auth_supported;
   double auth_mon_ticket_ttl;
   double auth_service_ticket_ttl;
   int auth_nonce_len;

diff --git a/src/mon/MonClient.cc b/src/mon/MonClient.cc
index 555361d87b28527d282e8e72624a13d8d65d8b22..77c851990214f60e63d18337e9422c0e95058d59 100644 (file)
--- a/src/mon/MonClient.cc
+++ b/src/mon/MonClient.cc
@@ -236,7 +236,7 @@ void MonClient::init()
   srand(getpid());
 
   auth_supported.clear();
-  string str = g_conf.supported_auth;
+  string str = g_conf.auth_supported;
   list<string> sup_list;
   get_str_list(str, sup_list);
   for (list<string>::iterator iter = sup_list.begin(); iter != sup_list.end(); ++iter) {

diff --git a/src/vstart.sh b/src/vstart.sh
index 2e91f01eeeaa8a367ab60ac9690230f18263e86d..7cc78932d11f676409d2c0ddc13490a3d9a108c9 100755 (executable)
--- a/src/vstart.sh
+++ b/src/vstart.sh
@@ -243,7 +243,7 @@ if [ "$start_mon" -eq 1 ]; then
 $extra_conf
 EOF
                        [ "$cephx" -eq 1 ] && cat<<EOF >> $conf
-        supported auth = cephx
+        auth supported = cephx
 EOF
                        cat <<EOF >> $conf
 [mds]