diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2020-05-14 13:57:14 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2020-05-14 13:57:14 +0000 |
| commit | 0c700953f06ebf1d9769f8861cdaba7541906bf2 (patch) | |
| tree | 95dc344ecf76752df35e8717e71acff7e7165c7c /sbin/dhclient/dhcpd.h | |
| parent | b857c663aeebfdf6245335135509ac3cbc5a0586 (diff) | |
Massage merge_option_data() to be more careful when dealing with 'D'
(domain search) and 't' (text) options. Enables append/prepend for the
domain-search option by inserting blanks between the domains and
ensures the presence of a terminating NUL when merging text.
Diffstat (limited to 'sbin/dhclient/dhcpd.h')
| -rw-r--r-- | sbin/dhclient/dhcpd.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sbin/dhclient/dhcpd.h b/sbin/dhclient/dhcpd.h index d98b12de0c3..ceba6388e4f 100644 --- a/sbin/dhclient/dhcpd.h +++ b/sbin/dhclient/dhcpd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: dhcpd.h,v 1.285 2020/01/23 22:39:35 krw Exp $ */ +/* $OpenBSD: dhcpd.h,v 1.286 2020/05/14 13:57:13 krw Exp $ */ /* * Copyright (c) 2004 Henning Brauer <henning@openbsd.org> @@ -167,7 +167,7 @@ char *code_to_name(int); char *code_to_format(int); int code_to_action(int, int); int name_to_code(char *); -void merge_option_data(struct option_data *, +void merge_option_data(char *, struct option_data *, struct option_data *, struct option_data *); /* conflex.c */ |