mir/isc-dhcp
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/dhcp synced 2025-08-29 13:28:14 +00:00
Code Issues Releases Wiki Activity

[master] Restore #define and hack bind.sh

Browse Source 
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
This commit is contained in:
Shawn Routhier 2014-08-06 15:01:34 -07:00
parent 454240a87f
commit db72e67d3a
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
includes/omapip/result.h
View File

@ -86,6 +86,7 @@
#define ISC_R_INVALIDARG DHCP_R_INVALIDARG #define ISC_R_INVALIDARG DHCP_R_INVALIDARG
#define ISC_R_NOTYET DHCP_R_NOTYET #define ISC_R_NOTYET DHCP_R_NOTYET
#define ISC_R_UNCHANGED DHCP_R_UNCHANGED #define ISC_R_UNCHANGED DHCP_R_UNCHANGED
#define ISC_R_MULTIPLE DHCP_R_MULTIPLE
#define ISC_R_KEYCONFLICT DHCP_R_KEYCONFLICT #define ISC_R_KEYCONFLICT DHCP_R_KEYCONFLICT
#define ISC_R_BADPARSE DHCP_R_BADPARSE #define ISC_R_BADPARSE DHCP_R_BADPARSE
#define ISC_R_NOKEYS DHCP_R_NOKEYS #define ISC_R_NOKEYS DHCP_R_NOKEYS

6
util/bind.sh
View File

@ -49,11 +49,11 @@ case $# in
### tarball with vastly different values. So the version.tmp can not ### tarball with vastly different values. So the version.tmp can not
### be used to chdir down into the directory that is unpacked. ### 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 ;;
v4_3) noSNAP=snapshot BINDTAG=v9_9 ;; v4_3) noSNAP=snapshot BINDTAG=v9_9_5_P1 ;;
### change to using the head of v9_9 until we upgrade DHCP ### change to using the head of v9_9 until we upgrade DHCP
### to use shared libraries ### 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 ;; ### HEAD|v[0-9]_[0-9].*) noSNAP=snapshot BINDTAG=HEAD ;;
### ###
### For ease of use, this records the sticky tag of versions ### For ease of use, this records the sticky tag of versions