From: Shawn Routhier Date: Thu, 19 Mar 2015 18:03:19 +0000 (-0700) Subject: Merge branch 'trac3755' X-Git-Tag: kea-0.9.1~13 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c71c7836804842bae51fe79fd599c57f5b3d007d;p=thirdparty%2Fkea.git Merge branch 'trac3755' Oputput started messages to the log files when the v4, v6 or DHCP-DDNS server has completed processing its configuration and is ready to start processing messages. Conflicts: ChangeLog --- c71c7836804842bae51fe79fd599c57f5b3d007d diff --cc ChangeLog index 09d1108326,604545c4c8..e95343bb9f --- a/ChangeLog +++ b/ChangeLog @@@ -1,17 -1,10 +1,24 @@@ -XXX. [func] sar ++916. [func] sar + Add a log message that indicates when the v4, v6 or + DHCP-DDNS server has completed processing its + configuration and is about to enter the loop to process + messages. + (Trac #3755, git TBD) + +915. [func] tomek, marcin + The DHCPv6 server now supports the Relay-Supplied Options + option, as defined in RFC 6422. The relay can insert options + in the relay forward message that the server will send back + to the client if certain criteria are met. + (Trac #3705, git 4772ee589712f5359ecbd79ebf71fbc7bb68741b) + +914. [bug] marcin + DHCPv4 server: corrected the logging message issued when + the server could not allocate or offer the lease for the + client. The corrected message contains the client-id, + hardware address, ciaddr and requested-ip-address. + (Trac #3737, git 4c56e1348c5d50eaa5b3083a0a8c346966e1b603) + 913. [bug] sar Handle recovery properly should the LFC crash while manipulating files after completing processing.