diff options
| author | Tomek Mrugalski <tomasz@isc.org> | 2015-10-09 23:28:19 +0200 |
|---|---|---|
| committer | Tomek Mrugalski <tomasz@isc.org> | 2015-10-09 23:28:19 +0200 |
| commit | 884d8bb4a55d3d7b1b8f3f01efb312bd8dec399b (patch) | |
| tree | f52b9a4fbdafa9c6bc588377347b2e0a38ccab7d /src/lib/dhcpsrv/lease_mgr_factory.h | |
| parent | [master] Merged trac4062 (fixed DaemonTest.createPIDFileOverwrite in debug) (diff) | |
| parent | [3681_rebase] DatabaseConnection is used in MemfileLeaseMgr (diff) | |
| download | kea-884d8bb4a55d3d7b1b8f3f01efb312bd8dec399b.tar.xz kea-884d8bb4a55d3d7b1b8f3f01efb312bd8dec399b.zip | |
[master] Merge branch 'trac3681_rebase' (Common MySQL Connection class)
Conflicts:
src/lib/dhcpsrv/lease_mgr.h
src/lib/dhcpsrv/memfile_lease_mgr.cc
src/lib/dhcpsrv/mysql_lease_mgr.cc
src/lib/dhcpsrv/tests/memfile_lease_mgr_unittest.cc
src/lib/dhcpsrv/tests/schema_mysql_copy.h
Diffstat (limited to 'src/lib/dhcpsrv/lease_mgr_factory.h')
| -rwxr-xr-x[-rw-r--r--] | src/lib/dhcpsrv/lease_mgr_factory.h | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/src/lib/dhcpsrv/lease_mgr_factory.h b/src/lib/dhcpsrv/lease_mgr_factory.h index 2f47e28314..e96450561a 100644..100755 --- a/src/lib/dhcpsrv/lease_mgr_factory.h +++ b/src/lib/dhcpsrv/lease_mgr_factory.h @@ -1,4 +1,4 @@ -// Copyright (C) 2012, 2015 Internet Systems Consortium, Inc. ("ISC") +// Copyright (C) 2012-2013,2015 Internet Systems Consortium, Inc. ("ISC") // // Permission to use, copy, modify, and/or distribute this software for any // purpose with or without fee is hereby granted, provided that the above @@ -16,6 +16,7 @@ #define LEASE_MGR_FACTORY_H #include <dhcpsrv/lease_mgr.h> +#include <dhcpsrv/database_connection.h> #include <exceptions/exceptions.h> #include <boost/scoped_ptr.hpp> @@ -100,26 +101,7 @@ public: /// create() to create one before calling this method. static LeaseMgr& instance(); - /// @brief Parse database access string - /// - /// Parses the string of "keyword=value" pairs and separates them - /// out into the map. - /// - /// @param dbaccess Database access string. - /// - /// @return std::map<std::string, std::string> Map of keyword/value pairs. - static LeaseMgr::ParameterMap parse(const std::string& dbaccess); - /// @brief Redact database access string - /// - /// Takes the database parameters and returns a database access string - /// passwords replaced by asterisks. This string is used in log messages. - /// - /// @param parameters Database access parameters (output of "parse"). - /// - /// @return Redacted database access string. - static std::string redactedAccessString( - const LeaseMgr::ParameterMap& parameters); private: /// @brief Hold pointer to lease manager |