aboutsummaryrefslogtreecommitdiffstats
path: root/com32/modules
diff options
context:
space:
mode:
authorMatt Fleming <matt.fleming@intel.com>2012-06-08 14:58:23 +0100
committerMatt Fleming <matt.fleming@intel.com>2012-06-08 14:58:23 +0100
commitcbe2f92bc756be6ae840a672ae1250ff11f99062 (patch)
tree1fcda68158d76995a5ad693d1ab01dae55427fb4 /com32/modules
parentb1b44de1264c40f806f672012bac590cf87eca92 (diff)
downloadsyslinux-cbe2f92bc756be6ae840a672ae1250ff11f99062.tar.gz
syslinux-cbe2f92bc756be6ae840a672ae1250ff11f99062.tar.xz
syslinux-cbe2f92bc756be6ae840a672ae1250ff11f99062.zip
pxechn: Fix merge botch s/pxe_dns/pxe_dns_resolv/
pxe_dns() was deleted in commit 6aba981cd93 ("pxe: resolve names via DNS from protected-mode code"), so when pxechn was merged from 'master' we should really have updated pxechn.c to use pxe_dns_resolv(). Signed-off-by: Matt Fleming <matt.fleming@intel.com>
Diffstat (limited to 'com32/modules')
-rw-r--r--com32/modules/pxechn.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/com32/modules/pxechn.c b/com32/modules/pxechn.c
index 1902d4ef..88a281e4 100644
--- a/com32/modules/pxechn.c
+++ b/com32/modules/pxechn.c
@@ -402,7 +402,7 @@ int pxechn_parse_fn(char fn[], in_addr_t *fip, char *host, char *fp[])
hsep = strchr(host, '@');
if (!hsep)
hsep = host;
- tip = pxe_dns(hsep);
+ tip = pxe_dns_resolv(hsep);
}
if (tip != 0)
*fip = tip;
@@ -755,7 +755,7 @@ int pxechn_parse_args(int argc, char *argv[], struct pxelinux_opt *pxe,
pxe->force = pxechn_parse_force(optarg);
break;
case 'g': /* gateway/DHCP relay */
- pxe->gip = pxe_dns(optarg);
+ pxe->gip = pxe_dns_resolv(optarg);
break;
case 'n': /* native */
break;