summaryrefslogtreecommitdiffstats
path: root/usr.sbin/sysinstall/media.c
diff options
context:
space:
mode:
authormurray <murray@FreeBSD.org>2000-04-10 19:39:01 +0000
committermurray <murray@FreeBSD.org>2000-04-10 19:39:01 +0000
commit1c9e14061b668928d6ea46d5c6ae97533a7a4880 (patch)
treefb8b266f70414e390fa613b7489324ef06830b59 /usr.sbin/sysinstall/media.c
parent6a912f1bed2b89b69259fce4a4e2443820ab9379 (diff)
downloadFreeBSD-src-1c9e14061b668928d6ea46d5c6ae97533a7a4880.zip
FreeBSD-src-1c9e14061b668928d6ea46d5c6ae97533a7a4880.tar.gz
Installing via an HTTP proxy should not attempt to resolve the
hostname of the FTP server; that is the proxy's job. This temporarily deletes the nameserver variable before calling mediaSetFTP. PR: 17371 Approved by: jkh
Diffstat (limited to 'usr.sbin/sysinstall/media.c')
-rw-r--r--usr.sbin/sysinstall/media.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/usr.sbin/sysinstall/media.c b/usr.sbin/sysinstall/media.c
index 806cb4c..9be0b5b 100644
--- a/usr.sbin/sysinstall/media.c
+++ b/usr.sbin/sysinstall/media.c
@@ -436,12 +436,16 @@ mediaSetFTPPassive(dialogMenuItem *self)
int mediaSetHTTP(dialogMenuItem *self)
{
int result;
- char *cp, *idx, hostname[MAXHOSTNAMELEN];
+ char *cp, *idx, hostname[MAXHOSTNAMELEN], *var_hostname;
extern int HttpPort;
int what = DITEM_RESTORE;
+ var_hostname=variable_get(VAR_NAMESERVER);
+ variable_unset(VAR_NAMESERVER);
result = mediaSetFTP(self);
+ variable_set2(VAR_NAMESERVER, var_hostname, 0);
+
if (DITEM_STATUS(result) != DITEM_SUCCESS)
return result;
OpenPOWER on IntegriCloud