diff options
author | Guillaume Cottenceau <gc@mandriva.com> | 2001-01-21 23:40:35 +0000 |
---|---|---|
committer | Guillaume Cottenceau <gc@mandriva.com> | 2001-01-21 23:40:35 +0000 |
commit | ef2fc9271457604bd677e0017fb9d13f06cdf41a (patch) | |
tree | 817cea73c981feecf2bc217260179e66f42f9995 | |
parent | b565feaae875310ec40b483b30eb823ae65f06ce (diff) | |
download | drakx-ef2fc9271457604bd677e0017fb9d13f06cdf41a.tar drakx-ef2fc9271457604bd677e0017fb9d13f06cdf41a.tar.gz drakx-ef2fc9271457604bd677e0017fb9d13f06cdf41a.tar.bz2 drakx-ef2fc9271457604bd677e0017fb9d13f06cdf41a.tar.xz drakx-ef2fc9271457604bd677e0017fb9d13f06cdf41a.zip |
allow providing void password in network/ftp installs
-rw-r--r-- | mdk-stage1/network.c | 2 | ||||
-rw-r--r-- | mdk-stage1/url.c | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/mdk-stage1/network.c b/mdk-stage1/network.c index b6256de47..884ddbc31 100644 --- a/mdk-stage1/network.c +++ b/mdk-stage1/network.c @@ -635,7 +635,7 @@ enum return_type ftp_prepare(void) results = ask_from_entries_auto("Please enter the name or IP address of the FTP server, " "the directory containing the " DISTRIB_NAME " Distribution, " - "and the login/pass if necessary (leave blank for anonymous).", + "and the login/pass if necessary (leave login blank for anonymous).", questions, &answers, 40, questions_auto); if (results != RETURN_OK) return ftp_prepare(); diff --git a/mdk-stage1/url.c b/mdk-stage1/url.c index bbfff8464..9781d281d 100644 --- a/mdk-stage1/url.c +++ b/mdk-stage1/url.c @@ -188,11 +188,10 @@ int ftp_open_connection(char * host, char * name, char * password, char * proxy) int rc; int port = 21; - if (!strcmp(name, "")) + if (!strcmp(name, "")) { name = "anonymous"; - - if (!strcmp(password, "")) password = "-drakx@"; + } if (strcmp(proxy, "")) { buf = alloca(strlen(name) + strlen(host) + 5); |