GitLab

    Merges in rt42834.

Merge branch 'master' of repo.isc.org:/proj/git/prod/dhcp

Squashed commit of the following:

commit c3e88212ff666701b5aca3cbc96b557fa37aa682
Author: Shawn Routhier <sar@isc.org>
Date:   Wed Aug 24 11:33:31 2016 -0700

    [rt42984] Clean up some memory references

Squashed commit of the following:

commit 375a26d52db75c3f62b8914f36e4f1618253075e
Author: Shawn Routhier <sar@isc.org>
Date:   Thu Aug 18 14:26:28 2016 -0700

    [rt43069] remove uses of vix.com, nominum.com and fugue.com

    Merges in rt41547b.

    Merges in 41547a

    Merges in rt41815a.

Update dmalloc to use a size_t as an argument which will
bring it in line with the call it makes to malloc and
avoid possible truncation.

If a lease is reused as part of dhcp-cache-threshold processing
the hostname (if it exists) needs to be copied from the temporary
lease back to the permanent lease.

Also add additional checks to see if the lease can be reused.
The host pointer, client ID and hardware address shouldn't have
changed.

Squashed commit of the following:

commit ed86441135b2dd001c1175abeaddc7fbfa5b3feb
Author: Shawn Routhier <sar@isc.org>
Date:   Tue Jul 19 20:31:42 2016 -0700

    [rt42113] Enhance the script to look at leases

    Merges in rt42226.

    Merges in rt41815.

Squashed commit of the following:

commit 70eb39525494f0c8ee6d1b1f1ae2cca391ab309e
Author: Shawn Routhier <sar@isc.org>
Date:   Mon Jun 27 13:46:37 2016 -0700

    [rt23954] Update DDNS code to remove PTR even if removing FWD had issues

Squashed commit of the following:

    [rt42666] Fix some cut and paste type errors in LDAP code

    Add the character '6' to some strings.  They were cut and pasted
    from the v4 versions and didn't get fully updated.

    Merges in 42008.

    Merges in rt41883.

Even if there was a definition for an ecncapsulated v6 option
and a set of values for it the v6 server wouldn't add it to
the outgoing packet.  This patch updates the server to do so.

Squashed commit of the following:

commit 0f8b7fe0a421e3c46ffff69ac0fe47804fc663ec
Author: Shawn Routhier <sar@isc.org>
Date:   Wed Jun 1 09:53:11 2016 -0700

    [rt42556] Fix copy and paste error to use remote id instead of circuit id