mir/isc-dhcp
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/dhcp synced 2025-09-05 00:35:41 +00:00
Code Issues Releases Wiki Activity

[master] Fixed concatenation of "Dc" formatted options such as domain-search

Browse Source 
Merges in rt20558.
This commit is contained in:
Thomas Markwalder
2014-11-25 15:21:39 -05:00
parent f3a44c1037
commit 04daf4fe4b
8 changed files with 414 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
includes/dhcpd.h
View File

@@ -2218,6 +2218,8 @@ int find_bound_string (struct data_string *,
struct binding_scope *, const char *);
int unset (struct binding_scope *, const char *);
int data_string_sprintfa(struct data_string *ds, const char *fmt, ...);
int concat_dclists (struct data_string *, struct data_string *,
struct data_string *);
/* dhcp.c */
extern int outstanding_pings;

3
includes/minires.h
View File

@@ -1,4 +1,5 @@
/*
* Copyright (c) 2014 by Internet Systems Consortium, Inc. ("ISC")
* Copyright (c) 2004,2007-2009 by Internet Systems Consortium, Inc. ("ISC")
* Copyright (c) 2001-2003 by Internet Software Consortium
*
@@ -39,5 +40,7 @@ int MRns_name_pack (const unsigned char *, unsigned char *,
unsigned, const unsigned char **, const unsigned char **);
int MRns_name_ntop(const unsigned char *, char *, size_t);
int MRns_name_pton(const char *, u_char *, size_t);
int MRns_name_uncompress_list(const unsigned char*, int buflen, char*, size_t);
int MRns_name_compress_list(const char*, int buflen, unsigned char*, size_t);
#endif /* MINIRES_H */

3
includes/tree.h
View File

@@ -191,7 +191,8 @@ enum expr_op {
expr_regex_match,
expr_iregex_match,
expr_gethostname,
expr_v6relay
expr_v6relay,
expr_concat_dclist
};
struct expression {