Hard error on JSON truncation
Adding a missed word.

Adding a word that was missing.
Fix testall always succeeding, even when there are failed tests.

We trap EXIT, so make sure we keep the return code.
Merge pull request #2011 from worr/bug/json-truncation

Hard error on JSON truncation
contrib/cfengine.el: add 25.1 compatibility code and clean up
Revert "Fix testall always succeeding, even when there are failed tests."

This reverts commit 0013fd83bb8c494dd0ca42c75c0384e4d2f6bc5a.

Apparently relying on the $? variable inside a trap handler doesn't
work in all shells (Solaris).

New fix will follow.
Fix testall returning success even when there are failures.

The trap handler hides the exit code, so don't use it unless we have
to.
Merge pull request #2015 from tzz/tzz/cfengine.el

contrib/cfengine.el: add 25.1 compatibility code and clean up
contrib/cfengine.el: Support add-log-current-defun-function
Add: Acceptance test for depends_on

Test that depends_on will restrict activation of a promise until all
dependant promises identified by promise handle are ok (either kept or
repaired).
Add: Acceptance test for module protocol

Should be able to use negative class expressions with classes defined
from module protocol right away.

ref: https://dev.cfengine.com/issues/6689
Merge pull request #2017 from nickanderson/redmine/6689

Add: Acceptance test for module protocol
Merge pull request #2019 from leoliu/master

contrib/cfengine.el: Support add-log-current-defun-function
Add: Acceptance test for file_select attributes

When attributes come from variables set directly in policy  file_select
with mtime behaves one way, and when those variables are populated from
an external data file file_select with mtime behaves differently.
Redmine #6590: Add leaner version of Solaris MAC address detection.

Also made sure that Solaris does not select the getifaddrs version,
since although the function is available, it cannot actually be used
to get the MAC address.

And removed a suppressed failure for Windows which is not correct
anymore.
Redmine #6590: Revert "add implementation of getifaddrs for solaris"

This reverts commit debbe3e770dd1ff8e2211ba2c2d3e5d2cbc36739.

Conflicts:

	libpromises/Makefile.am
	libpromises/solaris_ifaddrs.c
	libpromises/solaris_ifaddrs.h
	libpromises/unix.c
Add negative bounds checks for string_head and string_tail
Fail when read_file is called with a negative size
Merge pull request #2022 from worr/bugs/bounds-checks

Bounds checks for read_file, string_head and string_tail
Merge pull request #2014 from kacfengine/solaris_mac_address

Redmine #6590: Add leaner version of Solaris MAC address detection.