diff options
author | murray <murray@FreeBSD.org> | 2000-04-10 19:39:01 +0000 |
---|---|---|
committer | murray <murray@FreeBSD.org> | 2000-04-10 19:39:01 +0000 |
commit | 1c9e14061b668928d6ea46d5c6ae97533a7a4880 (patch) | |
tree | fb8b266f70414e390fa613b7489324ef06830b59 /release | |
parent | 6a912f1bed2b89b69259fce4a4e2443820ab9379 (diff) | |
download | FreeBSD-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 'release')
-rw-r--r-- | release/sysinstall/media.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/release/sysinstall/media.c b/release/sysinstall/media.c index 806cb4c..9be0b5b 100644 --- a/release/sysinstall/media.c +++ b/release/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; |