diff options
author | Matt Fleming <matt.fleming@intel.com> | 2012-06-13 11:17:29 +0100 |
---|---|---|
committer | Matt Fleming <matt.fleming@intel.com> | 2012-06-20 16:35:35 +0100 |
commit | f6e0c5e552ccbb17489097829116da03677a9270 (patch) | |
tree | 719bff45d30013948dcc93b8e10ce81d1553fcd2 /core | |
parent | fb543aa635ff117187c73ce0ae3dccf8ffe32161 (diff) | |
download | syslinux-f6e0c5e552ccbb17489097829116da03677a9270.tar.gz |
Revert "pxe: resolve names via DNS from protected-mode code"
This reverts commit 6aba981cd9310bae94587d3e51106261bf0e27b9.
dns_resolv() is only implemented for PXELINUX, meaning that if we try
to execute any module that references it under SYSLINUX, EXTLINUX or
ISOLINUX it fails to run because it cannot resolve the symbol.
We need a way to implement DNS resolution so that it works for
PXELINUX but returns an error for SYSLINUX/EXTLINUX or ISOLINUX,
without introducing undefined symbols. The old COMBOOT API method
worked splendidly for this, so revert until someone provides a better
solution.
Conflicts:
com32/lib/Makefile
com32/modules/host.c
mk/elf.mk
Cc: Paulo Alcantara <pcacjr@zytor.com>
Signed-off-by: Matt Fleming <matt.fleming@intel.com>
Diffstat (limited to 'core')
-rw-r--r-- | core/include/pxe.h | 43 |
1 files changed, 0 insertions, 43 deletions
diff --git a/core/include/pxe.h b/core/include/pxe.h deleted file mode 100644 index 86d6cfc4..00000000 --- a/core/include/pxe.h +++ /dev/null @@ -1,43 +0,0 @@ -/* ----------------------------------------------------------------------- * - * - * Copyright 2010 Intel Corporation; author: H. Peter Anvin - * Copyright 2012 Paulo Alcantara <pcacjr@zytor.com> - * - * Permission is hereby granted, free of charge, to any person - * obtaining a copy of this software and associated documentation - * files (the "Software"), to deal in the Software without - * restriction, including without limitation the rights to use, - * copy, modify, merge, publish, distribute, sublicense, and/or - * sell copies of the Software, and to permit persons to whom - * the Software is furnished to do so, subject to the following - * conditions: - * - * The above copyright notice and this permission notice shall - * be included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES - * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT - * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, - * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - * OTHER DEALINGS IN THE SOFTWARE. - * - * ----------------------------------------------------------------------- */ - -#ifndef PXE_H_ -#define PXE_H_ - -#include <stdio.h> -#include <stdint.h> - -extern uint32_t dns_resolv(const char *); - -/* Resolve a hostname via DNS */ -static inline uint32_t pxe_dns_resolv(const char *name) -{ - return dns_resolv(name); -} - -#endif /* PXE_H_ */ |