File tree Expand file tree Collapse file tree 2 files changed +0
-26
lines changed Expand file tree Collapse file tree 2 files changed +0
-26
lines changed Original file line number Diff line number Diff line change @@ -587,10 +587,6 @@ class McdEnvironmentImpl : public McdEnvironment {
587587 return (log_dir / " memcached" ).generic_string ();
588588 }
589589
590- cb::sasl::pwdb::MutablePasswordDatabase& getPasswordDatabase () override {
591- return passwordDatabase;
592- }
593-
594590 bool haveIPv4 () const override {
595591 return !ipaddresses.first .empty ();
596592 }
@@ -599,18 +595,6 @@ class McdEnvironmentImpl : public McdEnvironment {
599595 return !ipaddresses.second .empty ();
600596 }
601597
602- void refreshPasswordDatabase (MemcachedConnection& connection) override {
603- std::ofstream cbsasldb (isasl_file_name.generic_string ());
604- cbsasldb << passwordDatabase.to_json () << std::endl;
605- cbsasldb.close ();
606- auto rsp = connection.execute (
607- BinprotGenericCommand{cb::mcbp::ClientOpcode::IsaslRefresh});
608- if (!rsp.isSuccess ()) {
609- throw ConnectionError (
610- " refreshPasswordDatabase: Failed to reload database" , rsp);
611- }
612- }
613-
614598 void iterateLogLines (const std::function<bool (std::string_view line)>&
615599 callback) const override {
616600 for (const auto & p : std::filesystem::directory_iterator (log_dir)) {
Original file line number Diff line number Diff line change @@ -209,8 +209,6 @@ class McdEnvironment {
209209
210210 virtual std::string getLogFilePattern () const = 0;
211211
212- virtual cb::sasl::pwdb::MutablePasswordDatabase& getPasswordDatabase () = 0;
213-
214212 // / Do we have support for IPv4 addresses on the machine
215213 virtual bool haveIPv4 () const = 0;
216214
@@ -219,14 +217,6 @@ class McdEnvironment {
219217
220218 // / Get the password for the requested user
221219 virtual std::string getPassword (std::string_view user) const = 0;
222-
223- // / Write the current password database to disk and tell memcached to
224- // / reload the file
225- // /
226- // / @param connection a connection to the server (must have admin
227- // / privileges)
228- // / @throws std::exception for errors (file io, server failure etc)
229- virtual void refreshPasswordDatabase (MemcachedConnection& connection) = 0;
230220};
231221
232222extern std::unique_ptr<McdEnvironment> mcd_env;
You can’t perform that action at this time.
0 commit comments