GitLab

	modified:   README
	modified:   RELNOTES
	modified:   configure.ac

Manually merged changes for rt38677. Subsequent commit will
update autogenerated files.

    Last step in merging rt38619

    Manual merge of rt38619 changes, minus autogenerated files

    Merges in rt37501

	Merges in rt37780.

    Merges in rt37426.

    Merges in rt37415.

    server/dhcpd.c -
        moved declarations of local variable in main(), used by pid file
        logic, outside of debug conditional compilation.

    [rt37084]

    Change how we print the preferred_live and max_life variables
    into envvironment strings in the client code from being a signed
    int to an unsigned int.

    [rt38078] Move the check for another server to be earlier

    Move the code that checks if there is already a server
    running to be executed earlier in the process.  This
    puts it before the server touches the database which
    should avoid problems with rewriting a database from
    under a running server.

Fix typo in dhcp-options.5 to change hostname to domainname.
ticket 37649

Add a flag to avoid supersede_lease calling pool_timer
recursively when pool_timer can't handle that.
rt38002

    Merges in rt36960.  Note that for v4_1_esv a new compile switch,
    CONVERT_BACKUP_TO_FREE, was created which must be defined to
    enable the conversion of leases.  It is off by default.

    Merges in rt20558_b.  This was a manual merge.

    Merges in rt20558.

Patch for 36810 & 20352
This coves several related problems
1) When the primary is in conflict done it allows the secondary to
transition around resolution interrupted and potentical conflict previously
the primary would die on an illegal state.

2) It allows the servers to restart a bind update request.  Previously if
one of the servers sent an udpate request and there died (or had the communications
interrupted) in some states the first server wouldn't retransmit a new
update request and the other server wouldn't send any bind updates. This
was noticed in potential conflict.

3) Updated the state transitions to move the leases on the ack queue
back to the update queue in case of conflict-done as we might need to
retransmit them all.

4) Updated a transition from startup to potentical conflict instead
of resolution interrupted when the servers reconnect during the startup
phase in order to avoid a diffferent dead lock.

    Merges in rt37708.

    Merges in rt21323.

    Merged in a portion of 35958:
    Added else-clause to logic in setup_server_source_address to execute
    global scope statements when packet->shared_network is NULL.  This ensures
    a global definition of server-identifier (if one) will be used.

    Merges in rt36233.

    Merges in rt22806

    Merges in rt32453.

    Merges in rt36664

    Added credit to Tobias Stoeckmann to release notes.

    Merges in rt36021

    Missed a MACRO name difference between 4_1 and later versions.

    Merges in rt36653

    Merges in rt36897, minus the counter reset after every five packets.
    This eliminates the divide-by-zero issue but does not alter the outward
    behavior.