From: Andrei Pavel <andrei.pavel@qualitance.com>
Date: Thu, 17 Aug 2017 18:04:29 +0000 (+0300)
Subject: Merge branch 'isc-master' into minor-changes
X-Git-Tag: trac5524_base~16^2~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=529d15326887b3513413567e497118b3db2c24f3;p=thirdparty%2Fkea.git

Merge branch 'isc-master' into minor-changes
---

529d15326887b3513413567e497118b3db2c24f3
diff --cc src/lib/dhcpsrv/pgsql_connection.h
index 8e7fe884c8,9788972535..35e1644d64
--- a/src/lib/dhcpsrv/pgsql_connection.h
+++ b/src/lib/dhcpsrv/pgsql_connection.h
@@@ -23,7 -27,7 +27,7 @@@ const uint32_t PG_SCHEMA_VERSION_MINOR 
  // statement.
  const size_t PGSQL_MAX_PARAMETERS_IN_QUERY = 32;
  
- /// @brief Define a PostgreSQL statement
 -/// @brief Define a PostgreSQL SQL statement
++/// @brief Define a PostgreSQL statement.
  ///
  /// Each statement is associated with an index, which is used to reference the
  /// associated prepared statement.
@@@ -45,10 -49,10 +49,11 @@@ struct PgSqlTaggedStatement 
      const char* text;
  };
  
 +/// @{
  /// @brief Constants for PostgreSQL data types
- /// This are defined by PostgreSQL in <catalog/pg_type.h>, but including
+ /// These are defined by PostgreSQL in <catalog/pg_type.h>, but including
  /// this file is extraordinarily convoluted, so we'll use these to fill-in.
+ /// @{
  const size_t OID_NONE = 0;   // PostgreSQL infers proper type
  const size_t OID_BOOL = 16;
  const size_t OID_BYTEA = 17;
@@@ -58,9 -62,9 +63,9 @@@ const size_t OID_INT4 = 23;  // 4 byte 
  const size_t OID_TEXT = 25;
  const size_t OID_VARCHAR = 1043;
  const size_t OID_TIMESTAMP = 1114;
 -///@}
 +/// @}
  
- /// @brief RAII wrapper for Posgtresql Result sets
+ /// @brief RAII wrapper for PostgreSQL Result sets
  ///
  /// When a Postgresql statement is executed, the results are returned
  /// in pointer allocated structure, PGresult*. Data and status information
diff --cc src/lib/dhcpsrv/subnet.h
index f4c083bf75,3d91ae8bb9..e11187bfa3
--- a/src/lib/dhcpsrv/subnet.h
+++ b/src/lib/dhcpsrv/subnet.h
@@@ -306,8 -314,19 +313,18 @@@ public
      /// Also see explanation note in @ref white_list_.
      ///
      /// @param class_name client class to be supported by this subnet
 -    void
 -    allowClientClass(const isc::dhcp::ClientClass& class_name);
 +    void allowClientClass(const isc::dhcp::ClientClass& class_name);
  
+     /// @brief returns the client class white list
+     ///
+     /// @note The returned reference is only valid as long as the object
+     /// returned it is valid.
+     ///
+     /// @return client classes @ref white_list_
+     const isc::dhcp::ClientClasses& getClientClasses() const {
+         return (white_list_);
+     }
+ 
      /// @brief Specifies what type of Host Reservations are supported.
      ///
      /// Host reservations may be either in-pool (they reserve an address that