summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Brown2008-07-01 03:35:51 +0200
committerMichael Brown2008-07-01 03:35:51 +0200
commitd51d80f7854be874c7f60c6fda40d073cdfe717d (patch)
treefe58cce46490f15d91f1e32122d01eaac2087bc1
parent[dhcp] Verify server identifier on ProxyDHCPACKs (diff)
downloadipxe-d51d80f7854be874c7f60c6fda40d073cdfe717d.tar.gz
ipxe-d51d80f7854be874c7f60c6fda40d073cdfe717d.tar.xz
ipxe-d51d80f7854be874c7f60c6fda40d073cdfe717d.zip
[pxe] Fix a typo in PXENV_GET_CACHED_INFO that broke Altiris
__from_data16 takes the value pointed to, rather than the pointer itself. This was silently causing gPXE to return a dud buffer pointer when the caller did not supply a buffer for PXENV_GET_CACHED_INFO.
-rw-r--r--src/interface/pxe/pxe_preboot.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/interface/pxe/pxe_preboot.c b/src/interface/pxe/pxe_preboot.c
index 302953eb3..3574c7e32 100644
--- a/src/interface/pxe/pxe_preboot.c
+++ b/src/interface/pxe/pxe_preboot.c
@@ -197,7 +197,7 @@ PXENV_EXIT_t pxenv_get_cached_info ( struct s_PXENV_GET_CACHED_INFO
*/
get_cached_info->Buffer.segment = rm_ds;
get_cached_info->Buffer.offset =
- ( unsigned ) ( __from_data16 ( info ) );
+ ( unsigned ) ( & __from_data16 ( *info ) );
get_cached_info->BufferSize = sizeof ( *info );
DBG ( " returning %04x:%04x+%04x['%x']",
get_cached_info->Buffer.segment,