GitLab

This discovers a bug in the lexer, it doesn't produce initial whitespace
at the start of file.

To bring in test tools to check the actual produced error message.

Conflicts:
	src/lib/dns/master_loader.cc
	src/lib/dns/tests/master_loader_unittest.cc

Some corner cases and error crossbreeding with other features.

As suggested by Jinmei, extracting to separate method. Adjusting to
address changes added in between.

Which happens after the $INCLUDE directive.

Between the $INCLUDE and $ORIGIN. Mostly to make sure it is consistent.

Instead of a Name directly and paired bool to check if it was
initialized. This avoids using a "dummy" value to initialize it, because
Name can't be uninitialized.

Meaning the same name as previous

This is leftover from #2428, but it wasn't possible to handle then yet.

They all pass now, as the framework to handle them was already in place.
This is just to check it works well.

$INCLUDE handling in the isc::dns::MasterLoader

Conflicts:
	src/lib/dns/master_loader.cc

And a minor cleanup in the code

Conflicts:
	doc/devel/mainpage.dox
	src/bin/dhcp4/ctrl_dhcp4_srv.h
	src/bin/dhcp4/dhcp4_srv.h
	src/bin/dhcp6/dhcp6.dox

Also modified the following files during the
resolution of the merge issues:
    src/bin/dhcp4/config_parser.cc
    src/bin/dhcp4/ctrl_dhcp4_srv.cc
    src/bin/dhcp4/dhcp4.dox
    src/bin/dhcp6/config_parser.cc
    src/bin/dhcp6/tests/dhcp6_srv_unittest.cc
    src/lib/dhcp/option_custom.h
    src/lib/dhcp/pkt4.h
    src/lib/dhcpsrv/database_backends.dox

And use it in the master loader, instead of keeping it separately there.

Shorter and longer version of INCLUDE.

There were some small changes in the behaviour of MasterLoader as a
result of review, this is update do ZoneLoader and its tests to
incorporate that.

Reviewed as part of #2378, but merged as a separate branch.

The Zone loader class (glue class between zone updater and MasterLoader).

Some of the code can be shared between the variants, saving some code.

After the rebase on top of working 2377. The most significant - don't
access updater if it doesn't exist.

There's no way to know the master file would be broken in the
constructor. So update the documentation to say it'd throw from the
load() and loadIncremental().