diff options
| -rw-r--r-- | RELNOTES | 8 | ||||
| -rw-r--r-- | includes/omapip/result.h | 5 | ||||
| -rw-r--r-- | includes/site.h | 8 | ||||
| -rw-r--r-- | util/bind.sh | 6 |
4 files changed, 22 insertions, 5 deletions
@@ -83,6 +83,14 @@ by Eric Young (eay@cryptsoft.com). - Server now supports a failover split value of 256. [ISC-Bugs] #36664] +- Remove unneeded error #defines. These defines were included in case + external programs required the older versions of the macro. They + have been #ifdeffed for now and will be removed at a future date. + See site.h for the #define to include them again, but you should + switch to using the DHCP_R_* versions instead of the ISC_R_* versions. + Also ISC_R_MULTIPLE has been removed as it is also deifned in bind. + [ISC-Bugs #37128] + Changes since 4.3.1b1 - Modify the linux and openwrt dhclient scripts to process information diff --git a/includes/omapip/result.h b/includes/omapip/result.h index 3e4cf6a7..ae5f7d6a 100644 --- a/includes/omapip/result.h +++ b/includes/omapip/result.h @@ -2,7 +2,7 @@ */ /* - * Copyright (C) 2009 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2009,2014 Internet Systems Consortium, Inc. ("ISC") * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -80,13 +80,13 @@ // Included for historical reasons, these should be removed as // soon as reasonable +#ifdef INCLUDE_OLD_DHCP_ISC_ERROR_CODES #define ISC_R_HOSTUNKNOWN DHCP_R_HOSTUNKNOWN #define ISC_R_VERSIONMISMATCH DHCP_R_VERSIONMISMATCH #define ISC_R_PROTOCOLERROR DHCP_R_PROTOCOLERROR #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 @@ -113,6 +113,7 @@ #define ISC_R_NOT_EQUAL DHCP_R_NOT_EQUAL #define ISC_R_CONNRESET DHCP_R_CONNRESET #define ISC_R_UNKNOWNATTRIBUTE DHCP_R_UNKNOWNATTRIBUTE +#endif isc_result_t dhcp_result_register(void); diff --git a/includes/site.h b/includes/site.h index d87b309e..19a2e11f 100644 --- a/includes/site.h +++ b/includes/site.h @@ -304,6 +304,14 @@ removal of this define. Use at your own risk. */ /* #define ENABLE_GENTLE_SHUTDOWN */ +/* Include old error codes. This is provided in case you + are building an external program similar to omshell for + which you need the ISC_R_* error codes. You should switch + to DHCP_R_* error codes for those that have been defined + (see includes/omapip/result.h). The extra defines and + this option will be removed at some time. */ +/* #define INCLUDE_OLD_DHCP_ISC_ERROR_CODES */ + /* Include definitions for various options. In general these should be left as is, but if you have already defined one of these and prefer your definition you can comment the diff --git a/util/bind.sh b/util/bind.sh index 352fe9e1..173bca6b 100644 --- a/util/bind.sh +++ b/util/bind.sh @@ -49,11 +49,11 @@ 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_5_P1 ;; - v4_3) noSNAP=snapshot BINDTAG=v9_9_5_P1 ;; + v4_2) noSNAP=snapshot BINDTAG=v9_9 ;; + v4_3) noSNAP=snapshot BINDTAG=v9_9 ;; ### 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_5_P1 ;; + HEAD|v[0-9]_[0-9].*) noSNAP=snapshot BINDTAG=v9_9 ;; ### HEAD|v[0-9]_[0-9].*) noSNAP=snapshot BINDTAG=HEAD ;; ### ### For ease of use, this records the sticky tag of versions |