From 0bdf90da2b7b542b7ec884498702825bcd48f52a Mon Sep 17 00:00:00 2001 From: Yehuda Sadeh Date: Fri, 25 Sep 2009 16:19:38 -0700 Subject: [PATCH] auth: common_init should not always init keys --- src/auth/Auth.cc | 4 +++- src/authtool.cc | 2 +- src/cconf.cc | 2 +- src/ceph.cc | 2 +- src/cfuse.cc | 2 +- src/client/libceph.cc | 2 +- src/cmds.cc | 2 +- src/cmon.cc | 2 +- src/common/common_init.cc | 12 +++++++----- src/common/common_init.h | 3 ++- src/cosd.cc | 2 +- src/csyn.cc | 2 +- src/dumpjournal.cc | 2 +- src/dupstore.cc | 2 +- src/fakefuse.cc | 2 +- src/fakesyn.cc | 2 +- src/librados.cc | 4 ++-- src/mkmonfs.cc | 2 +- src/osdmaptool.cc | 2 +- src/rados.cc | 2 +- src/radosgw/rgw_admin.cc | 2 +- src/streamtest.cc | 2 +- src/testmsgr.cc | 2 +- 23 files changed, 33 insertions(+), 28 deletions(-) diff --git a/src/auth/Auth.cc b/src/auth/Auth.cc index 8d0da5612fefd..46dd5ad085d3c 100644 --- a/src/auth/Auth.cc +++ b/src/auth/Auth.cc @@ -96,7 +96,9 @@ bool AuthTicketHandler::verify_service_ticket_reply(CryptoKey& secret, AuthServiceTicket msg_a; bufferptr& s1 = secret.get_secret(); - hexdump("decoding, using key", s1.c_str(), s1.length()); + if (s1.length()) { + hexdump("decoding, using key", s1.c_str(), s1.length()); + } if (decode_decrypt(msg_a, secret, indata) < 0) return false; /* FIXME: decode into relevant ticket */ diff --git a/src/authtool.cc b/src/authtool.cc index 36b37b1855db6..67b7b5cae26ae 100644 --- a/src/authtool.cc +++ b/src/authtool.cc @@ -32,7 +32,7 @@ int main(int argc, const char **argv) argv_to_vec(argc, argv, args); env_to_vec(args); DEFINE_CONF_VARS(usage); - common_init(args, "osdmaptool", false); + common_init(args, "osdmaptool", false, false); const char *me = argv[0]; diff --git a/src/cconf.cc b/src/cconf.cc index 398c53c12ca4d..e5cd2a5cd2567 100644 --- a/src/cconf.cc +++ b/src/cconf.cc @@ -51,7 +51,7 @@ int main(int argc, const char **argv) } args.swap(nargs); - common_init(args, type, false); + common_init(args, type, false, false); FOR_EACH_ARG(args) { if (CONF_ARG_EQ("list_sections", 'l')) { diff --git a/src/ceph.cc b/src/ceph.cc index ddd40a16c7ac3..c12d780f5dd06 100644 --- a/src/ceph.cc +++ b/src/ceph.cc @@ -577,7 +577,7 @@ int main(int argc, const char **argv, const char *envp[]) vector args; argv_to_vec(argc, argv, args); env_to_vec(args); - common_init(args, "ceph", false); + common_init(args, "ceph", false, true); char *fname; vec_to_argv(args, argc, argv); diff --git a/src/cfuse.cc b/src/cfuse.cc index b8db144241a99..0cf206e5176e8 100644 --- a/src/cfuse.cc +++ b/src/cfuse.cc @@ -44,7 +44,7 @@ int main(int argc, const char **argv, const char *envp[]) { vector args; argv_to_vec(argc, argv, args); env_to_vec(args); - common_init(args, "cfuse", false); + common_init(args, "cfuse", false, true); // args for fuse vec_to_argv(args, argc, argv); diff --git a/src/client/libceph.cc b/src/client/libceph.cc index 4c2599d94e253..8984aab580012 100644 --- a/src/client/libceph.cc +++ b/src/client/libceph.cc @@ -39,7 +39,7 @@ extern "C" int ceph_initialize(int argc, const char **argv) //create everything to start a client vector args; argv_to_vec(argc, argv, args); - common_init(args, "libceph", false); + common_init(args, "libceph", false, true); if (g_conf.clock_tare) g_clock.tare(); //monmap monclient = new MonClient(); diff --git a/src/cmds.cc b/src/cmds.cc index a3831afa2d31b..d590476a9b8d0 100644 --- a/src/cmds.cc +++ b/src/cmds.cc @@ -48,7 +48,7 @@ int main(int argc, const char **argv) vector args; argv_to_vec(argc, argv, args); env_to_vec(args); - common_init(args, "mds", true); + common_init(args, "mds", true, true); // mds specific args for (unsigned i=0; i args; argv_to_vec(argc, argv, args); env_to_vec(args); - common_init(args, "mon", true); + common_init(args, "mon", true, true); // whoami char *end; diff --git a/src/common/common_init.cc b/src/common/common_init.cc index 6fab0731367a5..cadffad1ed5d7 100644 --- a/src/common/common_init.cc +++ b/src/common/common_init.cc @@ -6,7 +6,7 @@ #include "auth/KeyRing.h" -void common_init(std::vector& args, const char *module_type, bool daemon) +void common_init(std::vector& args, const char *module_type, bool daemon, bool init_keys) { tls_init(); tls_get_val()->disable_assert = 0; @@ -31,10 +31,12 @@ void common_init(std::vector& args, const char *module_type, bool d if (!g_conf.log_to_stdout) _dout_open_log(); - if (g_keyring.load_master(g_conf.keys_file)) { - dout(0) << "successfuly loaded secret key from " << g_conf.keys_file << dendl; - } else { - dout(0) << "failed to load secret key from " << g_conf.keys_file << dendl; + if (init_keys) { + if (g_keyring.load_master(g_conf.keys_file)) { + dout(0) << "successfuly loaded secret key from " << g_conf.keys_file << dendl; + } else { + dout(0) << "failed to load secret key from " << g_conf.keys_file << dendl; + } } } diff --git a/src/common/common_init.h b/src/common/common_init.h index 13e1f94860bb6..28a035d2d3e3c 100644 --- a/src/common/common_init.h +++ b/src/common/common_init.h @@ -5,6 +5,7 @@ void common_init(std::vector& args, const char *module_type, - bool daemon); + bool daemon, + bool init_keys); #endif diff --git a/src/cosd.cc b/src/cosd.cc index d1337fbf265d5..d3098b2290ad2 100644 --- a/src/cosd.cc +++ b/src/cosd.cc @@ -49,7 +49,7 @@ int main(int argc, const char **argv) vector args; argv_to_vec(argc, argv, args); env_to_vec(args); - common_init(args, "osd", true); + common_init(args, "osd", true, true); if (g_conf.clock_tare) g_clock.tare(); diff --git a/src/csyn.cc b/src/csyn.cc index 88b87b7dd8737..c1f18bb6aaca0 100644 --- a/src/csyn.cc +++ b/src/csyn.cc @@ -42,7 +42,7 @@ int main(int argc, const char **argv, char *envp[]) //cerr << "csyn starting" << std::endl; vector args; argv_to_vec(argc, argv, args); - common_init(args, "csyn", false); + common_init(args, "csyn", false, true); parse_syn_options(args); // for SyntheticClient vec_to_argv(args, argc, argv); diff --git a/src/dumpjournal.cc b/src/dumpjournal.cc index 447aaa689971b..82bfe0f57aceb 100644 --- a/src/dumpjournal.cc +++ b/src/dumpjournal.cc @@ -79,7 +79,7 @@ int main(int argc, const char **argv, const char *envp[]) vector args; argv_to_vec(argc, argv, args); env_to_vec(args); - common_init(args, "dumpjournal", false); + common_init(args, "dumpjournal", false, false); vec_to_argv(args, argc, argv); diff --git a/src/dupstore.cc b/src/dupstore.cc index 3eb53abfdf8d6..0932ddc1573b7 100644 --- a/src/dupstore.cc +++ b/src/dupstore.cc @@ -86,7 +86,7 @@ int main(int argc, const char **argv) vector args; argv_to_vec(argc, argv, args); env_to_vec(args); - common_init(args, "dumpstore", false); + common_init(args, "dumpstore", false, false); // args if (args.size() != 4) diff --git a/src/fakefuse.cc b/src/fakefuse.cc index 2e3e947083859..8a88d6f395abd 100644 --- a/src/fakefuse.cc +++ b/src/fakefuse.cc @@ -69,7 +69,7 @@ int main(int argc, const char **argv) { vector args; argv_to_vec(argc, argv, args); env_to_vec(args); - common_init(args, "fakefuse", false); + common_init(args, "fakefuse", false, false); // start messenger thread fakemessenger_startthread(); diff --git a/src/fakesyn.cc b/src/fakesyn.cc index a4d2c21413edb..2e4031c74e948 100644 --- a/src/fakesyn.cc +++ b/src/fakesyn.cc @@ -66,7 +66,7 @@ int main(int argc, const char **argv) g_conf.mon_stop_on_last_unmount = true; g_conf.mon_stop_with_last_mds = true; - common_init(args, "fakesyn"); + common_init(args, "fakesyn", false); int start = 0; diff --git a/src/librados.cc b/src/librados.cc index 6b473e400e503..e1bbf8344bdb4 100644 --- a/src/librados.cc +++ b/src/librados.cc @@ -1030,7 +1030,7 @@ int Rados::initialize(int argc, const char *argv[]) argv_to_vec(argc, argv, args); env_to_vec(args); } - common_init(args, "librados", false); + common_init(args, "librados", false, true); if (g_conf.clock_tare) g_clock.tare(); @@ -1311,7 +1311,7 @@ static void __rados_init(int argc, const char *argv[]) argv_to_vec(argc, argv, args); env_to_vec(args); } - common_init(args, "librados", false); + common_init(args, "librados", false, true); if (g_conf.clock_tare) g_clock.tare(); } diff --git a/src/mkmonfs.cc b/src/mkmonfs.cc index e366125b5715c..fab2d06bb50b1 100644 --- a/src/mkmonfs.cc +++ b/src/mkmonfs.cc @@ -34,7 +34,7 @@ int main(int argc, const char **argv) vector args; argv_to_vec(argc, argv, args); DEFINE_CONF_VARS(usage); - common_init(args, "mon", false); + common_init(args, "mon", false, false); bool clobber = false; const char *fsdir = g_conf.mon_data; diff --git a/src/osdmaptool.cc b/src/osdmaptool.cc index 5cb650651222c..ee1c127eaecad 100644 --- a/src/osdmaptool.cc +++ b/src/osdmaptool.cc @@ -45,7 +45,7 @@ int main(int argc, const char **argv) argv_to_vec(argc, argv, args); env_to_vec(args); DEFINE_CONF_VARS(usage); - common_init(args, "osdmaptool", false); + common_init(args, "osdmaptool", false, false); const char *me = argv[0]; diff --git a/src/rados.cc b/src/rados.cc index 46a59737e91d2..8b1c5a256a8d6 100644 --- a/src/rados.cc +++ b/src/rados.cc @@ -228,7 +228,7 @@ int main(int argc, const char **argv) vector args; argv_to_vec(argc, argv, args); env_to_vec(args); - common_init(args, "rados", false); + common_init(args, "rados", false, true); vector nargs; bufferlist indata, outdata; diff --git a/src/radosgw/rgw_admin.cc b/src/radosgw/rgw_admin.cc index 1b73af5ea4702..4f7ab8d69569e 100644 --- a/src/radosgw/rgw_admin.cc +++ b/src/radosgw/rgw_admin.cc @@ -120,7 +120,7 @@ int main(int argc, char **argv) vector args; argv_to_vec(argc, (const char **)argv, args); env_to_vec(args); - common_init(args, "rgw", true); + common_init(args, "rgw", true, true); const char *user_id = 0; const char *secret_key = 0; diff --git a/src/streamtest.cc b/src/streamtest.cc index a8b76e4a1eeb3..0923f11f5bedd 100644 --- a/src/streamtest.cc +++ b/src/streamtest.cc @@ -77,7 +77,7 @@ int main(int argc, const char **argv) vector args; argv_to_vec(argc, argv, args); env_to_vec(args); - common_init(args, NULL, false); + common_init(args, NULL, false, true); // args if (args.size() < 3) return -1; diff --git a/src/testmsgr.cc b/src/testmsgr.cc index f4f15c329db2b..3f16bec14a2f1 100644 --- a/src/testmsgr.cc +++ b/src/testmsgr.cc @@ -69,7 +69,7 @@ int main(int argc, const char **argv, const char *envp[]) { vector args; argv_to_vec(argc, argv, args); env_to_vec(args); - common_init(args, NULL, false); + common_init(args, NULL, false, false); vec_to_argv(args, argc, argv); -- 2.39.5