]>
Commit | Line | Data |
---|---|---|
efbd3a9a MT |
1 | From 62018e1f720fa11e83879111a4b1b3753b5c25bb Mon Sep 17 00:00:00 2001 |
2 | From: Simon Kelley <simon@thekelleys.org.uk> | |
3 | Date: Thu, 14 May 2015 21:30:00 +0100 | |
697b4f04 | 4 | Subject: [PATCH 094/113] Use correct DHCP context for PXE-proxy server-id. |
efbd3a9a MT |
5 | |
6 | --- | |
7 | src/rfc2131.c | 4 ++-- | |
8 | 1 file changed, 2 insertions(+), 2 deletions(-) | |
9 | ||
10 | diff --git a/src/rfc2131.c b/src/rfc2131.c | |
11 | index b95f9beadf59..70d1e59530ad 100644 | |
12 | --- a/src/rfc2131.c | |
13 | +++ b/src/rfc2131.c | |
14 | @@ -888,10 +888,10 @@ size_t dhcp_reply(struct dhcp_context *context, char *iface_name, int int_index, | |
15 | ||
16 | option_put(mess, end, OPTION_MESSAGE_TYPE, 1, | |
17 | mess_type == DHCPDISCOVER ? DHCPOFFER : DHCPACK); | |
18 | - option_put(mess, end, OPTION_SERVER_IDENTIFIER, INADDRSZ, htonl(context->local.s_addr)); | |
19 | + option_put(mess, end, OPTION_SERVER_IDENTIFIER, INADDRSZ, htonl(tmp->local.s_addr)); | |
20 | pxe_misc(mess, end, uuid); | |
21 | prune_vendor_opts(tagif_netid); | |
22 | - do_encap_opts(pxe_opts(pxearch, tagif_netid, context->local, now), OPTION_VENDOR_CLASS_OPT, DHOPT_VENDOR_MATCH, mess, end, 0); | |
23 | + do_encap_opts(pxe_opts(pxearch, tagif_netid, tmp->local, now), OPTION_VENDOR_CLASS_OPT, DHOPT_VENDOR_MATCH, mess, end, 0); | |
24 | ||
25 | log_packet("PXE", NULL, emac, emac_len, iface_name, ignore ? "proxy-ignored" : "proxy", NULL, mess->xid); | |
26 | log_tags(tagif_netid, ntohl(mess->xid)); | |
27 | -- | |
28 | 2.1.0 | |
29 |