summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.org>2004-06-14 15:07:24 +0000
committerOlivier Blin <oblin@mandriva.org>2004-06-14 15:07:24 +0000
commitcfb8a6a2d2d26631375b3b65fb5a19f8f310ed38 (patch)
treedb121c8006f6289ae7753534bc760dfc722ff74c
parent5e5fc918a9f78c9c838cd73cce58faef9197b947 (diff)
downloaddrakx-backup-do-not-use-cfb8a6a2d2d26631375b3b65fb5a19f8f310ed38.tar
drakx-backup-do-not-use-cfb8a6a2d2d26631375b3b65fb5a19f8f310ed38.tar.gz
drakx-backup-do-not-use-cfb8a6a2d2d26631375b3b65fb5a19f8f310ed38.tar.bz2
drakx-backup-do-not-use-cfb8a6a2d2d26631375b3b65fb5a19f8f310ed38.tar.xz
drakx-backup-do-not-use-cfb8a6a2d2d26631375b3b65fb5a19f8f310ed38.zip
always fill proxy fields of interfaces
-rw-r--r--mdk-stage1/network.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/mdk-stage1/network.c b/mdk-stage1/network.c
index bc7ead230..af384c427 100644
--- a/mdk-stage1/network.c
+++ b/mdk-stage1/network.c
@@ -622,9 +622,6 @@ static enum return_type intf_get_http_proxy(struct interface_info * intf)
if (results == RETURN_OK) {
intf->http_proxy_host = strdup(answers[0]);
intf->http_proxy_port = strdup(answers[1]);
- } else {
- intf->http_proxy_host = "";
- intf->http_proxy_port = "";
}
return results;
@@ -660,6 +657,9 @@ static enum return_type intf_select_and_up(char **http_proxy_host, char **http_p
results = bringup_networking(sel_intf);
if (results == RETURN_OK) {
+ intf->http_proxy_host = "";
+ intf->http_proxy_port = "";
+
if (http_proxy_host && http_proxy_port) {
intf_get_http_proxy(intf);
*http_proxy_host = intf->http_proxy_host;