From: Ronen Friedman <49867032+ronen-fr@users.noreply.github.com>
Date: Mon, 30 Aug 2021 09:44:40 +0000 (+0300)
Subject: Merge pull request #42848 from ronen-fr/wip-ronenf-argv2vec-users
X-Git-Tag: v17.1.0~985
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f938712b7c81f9e004827d1dc2fe0f005ee1b3b0;p=ceph.git

Merge pull request #42848 from ronen-fr/wip-ronenf-argv2vec-users

common: modify 'main()s' to use new argv_to_vec() signature

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
Reviewed-by: Deepika Upadhyay <dupadhya@redhat.com>
---

f938712b7c81f9e004827d1dc2fe0f005ee1b3b0
diff --cc src/rgw/rgw_main.cc
index 04ca80b0192e,4bb0364c2d4c..c44b0cba61ca
--- a/src/rgw/rgw_main.cc
+++ b/src/rgw/rgw_main.cc
@@@ -193,13 -193,10 +193,12 @@@ int radosgw_Main(int argc, const char *
      { "debug_rgw", "1/5" },
      { "keyring", "$rgw_data/keyring" },
      { "objecter_inflight_ops", "24576" },
 -    { "ms_mon_client_mode", "secure" }
 +    // require a secure mon connection by default
 +    { "ms_mon_client_mode", "secure" },
 +    { "auth_client_required", "cephx" }
    };
  
-   vector<const char*> args;
-   argv_to_vec(argc, argv, args);
+   auto args = argv_to_vec(argc, argv);
    if (args.empty()) {
      cerr << argv[0] << ": -h or --help for usage" << std::endl;
      exit(1);