mirror of
https://github.com/isc-projects/bind9.git
synced 2026-06-08 20:12:06 -04:00
Fix up some of the sanatize code and make kits correctly
This commit is contained in:
parent
9820fcb6cd
commit
a53151d995
7 changed files with 14 additions and 6134 deletions
|
|
@ -13,7 +13,7 @@
|
|||
# ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
|
||||
# SOFTWARE.
|
||||
|
||||
# $Id: Makefile.in,v 1.26 2000/07/20 00:41:50 gson Exp $
|
||||
# $Id: Makefile.in,v 1.27 2000/07/26 23:40:08 mws Exp $
|
||||
|
||||
srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
|
|
@ -43,6 +43,7 @@ install:: isc-config.sh
|
|||
${INSTALL_PROGRAM} isc-config.sh ${DESTDIR}${bindir}
|
||||
|
||||
kit: kitclean
|
||||
sh util/sanitize_all.sh
|
||||
mkdir bind-${VERSION}
|
||||
@(cd bind-${VERSION}; for i in ${DISTFILES}; do ln -s ../$$i $$i; done)
|
||||
mkdir bind-${VERSION}/doc
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
Makefile
|
||||
confparser_p.h
|
||||
confparser.c
|
||||
confparser.y
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
# ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
|
||||
# SOFTWARE.
|
||||
|
||||
# $Id: Makefile.in,v 1.14 2000/07/26 18:47:35 mws Exp $
|
||||
# $Id: Makefile.in,v 1.15 2000/07/26 23:40:11 mws Exp $
|
||||
|
||||
srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
|
|
@ -77,4 +77,4 @@ confparser.y: confparser.y.dirty
|
|||
depend: confparser.c
|
||||
|
||||
distclean::
|
||||
rm -f confparser.c confparser_p.h
|
||||
rm -f confparser.c confparser_p.h confparser.y
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
* SOFTWARE.
|
||||
*/
|
||||
|
||||
/* $Id: confip.c,v 1.29 2000/07/26 18:47:36 mws Exp $ */
|
||||
/* $Id: confip.c,v 1.30 2000/07/26 23:40:14 mws Exp $ */
|
||||
|
||||
#include <config.h>
|
||||
|
||||
|
|
@ -822,7 +822,9 @@ dns_c_iplist_new(isc_mem_t *mem, int length, dns_c_iplist_t **newlist) {
|
|||
isc_result_t
|
||||
dns_c_iplist_detach(dns_c_iplist_t **list) {
|
||||
dns_c_iplist_t *l ;
|
||||
#ifndef NOMINUM_PUBLIC
|
||||
unsigned int i;
|
||||
#endif /* NOMINUM_PUBLIC */
|
||||
|
||||
|
||||
REQUIRE(list != NULL);
|
||||
|
|
@ -958,9 +960,7 @@ void
|
|||
dns_c_iplist_printfully(FILE *fp, int indent, isc_boolean_t porttoo,
|
||||
dns_c_iplist_t *list)
|
||||
{
|
||||
#ifndef NOMINUM_PUBLIC
|
||||
isc_uint32_t i;
|
||||
#endif /* NOMINUM_PUBLIC */
|
||||
in_port_t port;
|
||||
in_port_t tmpport;
|
||||
isc_boolean_t athead = ISC_TRUE;
|
||||
|
|
@ -1136,7 +1136,9 @@ dns_c_iplist_remove(dns_c_iplist_t *list, isc_sockaddr_t newaddr) {
|
|||
|
||||
for ( /* nothing */ ; i < list->nextidx ; i++) {
|
||||
list->ips[i] = list->ips[i + 1];
|
||||
#ifndef NOMINUM_PUBLIC
|
||||
list->keys[i] = list->keys[i + 1];
|
||||
#endif /* NOMINUM_PUBLIC */
|
||||
}
|
||||
|
||||
return (ISC_R_SUCCESS);
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -16,7 +16,7 @@
|
|||
* SOFTWARE.
|
||||
*/
|
||||
|
||||
/* $Id: confparser.y.dirty,v 1.1 2000/07/26 18:47:40 mws Exp $ */
|
||||
/* $Id: confparser.y.dirty,v 1.2 2000/07/26 23:40:19 mws Exp $ */
|
||||
|
||||
#include <config.h>
|
||||
|
||||
|
|
@ -5081,7 +5081,7 @@ in_addr_list: in_addr_elem L_EOS
|
|||
#ifndef NOMINUM_PUBLIC
|
||||
tmpres = dns_c_iplist_append($1, $2, NULL);
|
||||
#else /* NOMINUM_PUBLIC */
|
||||
tmpres = dns_c_iplist_append($1, $2, NULL);
|
||||
tmpres = dns_c_iplist_append($1, $2);
|
||||
#endif /* NOMINUM_PUBLIC */
|
||||
if (tmpres != ISC_R_SUCCESS) {
|
||||
parser_error(ISC_TRUE,
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
* SOFTWARE.
|
||||
*/
|
||||
|
||||
/* $Id: confip.h,v 1.24 2000/07/26 18:47:41 mws Exp $ */
|
||||
/* $Id: confip.h,v 1.25 2000/07/26 23:40:22 mws Exp $ */
|
||||
|
||||
#ifndef DNS_CONFIP_H
|
||||
#define DNS_CONFIP_H 1
|
||||
|
|
@ -240,7 +240,7 @@ isc_result_t dns_c_iplist_append(dns_c_iplist_t *list,
|
|||
isc_sockaddr_t newaddr, const char *key);
|
||||
#else /* NOMINUM_PUBLIC */
|
||||
isc_result_t dns_c_iplist_append(dns_c_iplist_t *list,
|
||||
isc_sockaddr_t newaddr, const char *key);
|
||||
isc_sockaddr_t newaddr);
|
||||
#endif /* NOMINUM_PUBLIC */
|
||||
|
||||
isc_result_t dns_c_iplist_remove(dns_c_iplist_t *list, isc_sockaddr_t newaddr);
|
||||
|
|
|
|||
Loading…
Reference in a new issue