[syslinux:elflink] pxechn: Fix merge botch s/pxe_dns/ pxe_dns_resolv/

syslinux-bot for Matt Fleming matt.fleming at intel.com
Tue Jun 26 09:54:06 PDT 2012


Commit-ID:  cbe2f92bc756be6ae840a672ae1250ff11f99062
Gitweb:     http://www.syslinux.org/commit/cbe2f92bc756be6ae840a672ae1250ff11f99062
Author:     Matt Fleming <matt.fleming at intel.com>
AuthorDate: Fri, 8 Jun 2012 14:58:23 +0100
Committer:  Matt Fleming <matt.fleming at intel.com>
CommitDate: Fri, 8 Jun 2012 14:58:23 +0100

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 at intel.com>

---
 com32/modules/pxechn.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/com32/modules/pxechn.c b/com32/modules/pxechn.c
index 1902d4e..88a281e 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;


More information about the Syslinux-commits mailing list