diff options
author | Shawn Routhier <sar@isc.org> | 2014-08-06 15:01:34 -0700 |
---|---|---|
committer | Shawn Routhier <sar@isc.org> | 2014-08-06 15:01:34 -0700 |
commit | db72e67d3a512d38f34688ef36a8d6ee5a2283d4 (patch) | |
tree | 5d2ad6545d6b00afde4418d8f6f12f481190efe8 /includes/omapip/result.h | |
parent | 454240a87fb75f6b5bd8dba43b60e6e6c79e13c1 (diff) | |
download | isc-dhcp-db72e67d3a512d38f34688ef36a8d6ee5a2283d4.tar.gz |
[master] Restore #define and hack bind.sh
Resore the R_MULTIPLE #define so we have the same code
in final as we did in rc1.
Change the bind.sh file so we use 9.9.5-P1 for testing master, 4.2 and 4.3
until we do remove the #define
Diffstat (limited to 'includes/omapip/result.h')
-rw-r--r-- | includes/omapip/result.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/includes/omapip/result.h b/includes/omapip/result.h index 5a4d0365..3e4cf6a7 100644 --- a/includes/omapip/result.h +++ b/includes/omapip/result.h @@ -86,6 +86,7 @@ #define ISC_R_INVALIDARG DHCP_R_INVALIDARG #define ISC_R_NOTYET DHCP_R_NOTYET #define ISC_R_UNCHANGED DHCP_R_UNCHANGED +#define ISC_R_MULTIPLE DHCP_R_MULTIPLE #define ISC_R_KEYCONFLICT DHCP_R_KEYCONFLICT #define ISC_R_BADPARSE DHCP_R_BADPARSE #define ISC_R_NOKEYS DHCP_R_NOKEYS |