rgwlib: robustify non-default initialization

Don't rely on the conf-default value of rgw_nfs_frontends to
provide "rgw-nfs," as that's not optional when running under
librgw.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>

diff --git a/src/rgw/rgw_appmain.cc b/src/rgw/rgw_appmain.cc
index 69a492dd235168a339c2ed3a35177963c8bc4421..0d99df0c1c966c5b7c81ddce99e7d22da0df3ce9 100644 (file)
--- a/src/rgw/rgw_appmain.cc
+++ b/src/rgw/rgw_appmain.cc
@@ -98,7 +98,13 @@ void rgw::AppMain::init_frontends1(bool nfs)
   g_conf().early_expand_meta(rgw_frontends_str, &cerr);
   get_str_vec(rgw_frontends_str, ",", frontends);
 
-  if (!nfs) {
+  /* default frontends */
+  if (nfs) {
+    const auto is_rgw_nfs = [](const auto& s){return s == "rgw-nfs";};
+    if (std::find_if(frontends.begin(), frontends.end(), is_rgw_nfs) == frontends.end()) {
+      frontends.push_back("rgw-nfs");
+    }
+  } else {
     if (frontends.empty()) {
       frontends.push_back("beast");
     }