d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Installing via an HTTP proxy should not attempt to resolve the

Browse Source 
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
This commit is contained in:
murray 2000-04-10 19:39:01 +00:00
parent 6a912f1bed
commit 1c9e14061b
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
release/sysinstall/media.c
View File

@ -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;

6
usr.sbin/sysinstall/media.c
View File

@ -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;