aboutsummaryrefslogtreecommitdiffstats
path: root/com32/libupload
diff options
context:
space:
mode:
authorMatt Fleming <matt.fleming@intel.com>2012-06-13 11:17:29 +0100
committerMatt Fleming <matt.fleming@intel.com>2012-06-20 16:35:35 +0100
commitf6e0c5e552ccbb17489097829116da03677a9270 (patch)
tree719bff45d30013948dcc93b8e10ce81d1553fcd2 /com32/libupload
parentfb543aa635ff117187c73ce0ae3dccf8ffe32161 (diff)
downloadsyslinux-f6e0c5e552ccbb17489097829116da03677a9270.tar.gz
syslinux-f6e0c5e552ccbb17489097829116da03677a9270.tar.xz
syslinux-f6e0c5e552ccbb17489097829116da03677a9270.zip
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 'com32/libupload')
-rw-r--r--com32/libupload/upload_tftp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/com32/libupload/upload_tftp.c b/com32/libupload/upload_tftp.c
index 10427ace..5e73c1c5 100644
--- a/com32/libupload/upload_tftp.c
+++ b/com32/libupload/upload_tftp.c
@@ -153,7 +153,7 @@ static int upload_tftp_write(struct upload_backend *be)
tftp.seq = 0;
if (be->argv[1]) {
- tftp.srv_ip = pxe_dns_resolv(be->argv[1]);
+ tftp.srv_ip = pxe_dns(be->argv[1]);
if (!tftp.srv_ip) {
// printf("\nUnable to resolve hostname: %s\n", be->argv[1]);
return -TFTP_ERR_UNABLE_TO_RESOLVE;