diff options
| author | Thomas Markwalder <tmark@isc.org> | 2014-11-25 15:21:39 -0500 |
|---|---|---|
| committer | Thomas Markwalder <tmark@isc.org> | 2014-11-25 15:22:52 -0500 |
| commit | 04daf4fe4b5dd4afac1aed901bfe8dda3ec0edf3 (patch) | |
| tree | e9f8f975accc8e3103e731f94fd3d2b581628c1e /includes/dhcpd.h | |
| parent | f3a44c1037cc7ef5a16c9e5e033242ac08fbb21f (diff) | |
| download | isc-dhcp-04daf4fe4b5dd4afac1aed901bfe8dda3ec0edf3.tar.gz | |
[master] Fixed concatenation of "Dc" formatted options such as domain-search
Merges in rt20558.
Diffstat (limited to 'includes/dhcpd.h')
| -rw-r--r-- | includes/dhcpd.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/includes/dhcpd.h b/includes/dhcpd.h index 5bc1802e..625a0bd6 100644 --- a/includes/dhcpd.h +++ b/includes/dhcpd.h @@ -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; |