diff options
| author | Shawn Routhier <sar@isc.org> | 2014-08-06 15:28:57 -0700 |
|---|---|---|
| committer | Shawn Routhier <sar@isc.org> | 2014-08-06 15:28:57 -0700 |
| commit | 1a9871da9208c9af302cdb8b83254ca1bdc72ba6 (patch) | |
| tree | 9fdc3d42d30354ac10c77ce290a574c41825d665 | |
| parent | 45ca54cd956f6992001bf8c4adfe79f4c1eab38c (diff) | |
| download | isc-dhcp-1a9871da9208c9af302cdb8b83254ca1bdc72ba6.tar.gz | |
[v4_2] 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 fileso we use 9.9.5-P1 for testing master, and 4.2
until we do remove the #define
| -rw-r--r-- | includes/omapip/result.h | 1 | ||||
| -rw-r--r-- | util/bind.sh | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/includes/omapip/result.h b/includes/omapip/result.h index 5a4d0365..550f5546 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 diff --git a/util/bind.sh b/util/bind.sh index ee1172ee..8bcc7aab 100644 --- a/util/bind.sh +++ b/util/bind.sh @@ -49,10 +49,10 @@ case $# in ### tarball with vastly different values. So the version.tmp can not ### be used to chdir down into the directory that is unpacked. ### - v4_2) noSNAP=snapshot BINDTAG=v9_9 ;; + v4_2) noSNAP=snapshot BINDTAG=v9_9_5_P1 ;; ### change to using the head of v9_9 until we upgrade DHCP ### to use shared libraries - HEAD|v[0-9]_[0-9].*) noSNAP=snapshot BINDTAG=v9_9 ;; + HEAD|v[0-9]_[0-9].*) noSNAP=snapshot BINDTAG=v9_9_5_P1 ;; ### HEAD|v[0-9]_[0-9].*) noSNAP=snapshot BINDTAG=HEAD ;; ### ### For ease of use, this records the sticky tag of versions |