Add support for FTP through a web proxy (via the ftp_proxy environment
variable).
This commit is contained in:
scottr
parent
06f9773006
commit
d4a2f03f78
|
|
@ -1,4 +1,4 @@
|
|||
.\" $NetBSD: sysinst,v 1.23 2001/05/25 08:04:13 mbw Exp $
|
||||
.\" $NetBSD: sysinst,v 1.24 2001/06/06 23:12:48 scottr Exp $
|
||||
.\"
|
||||
.\" Copyright (c) 1999-2001 The NetBSD Foundation, Inc.
|
||||
.\" All rights reserved.
|
||||
|
|
@ -1129,8 +1129,9 @@ in answer to these questions, and DNS will not be used.
|
|||
.Pp
|
||||
You will also be asked to specify the host that you want
|
||||
to transfer the sets from, the directory on that host,
|
||||
and the account name and password used to log into that
|
||||
host using ftp. If you did not set up DNS when answering
|
||||
the account name and password used to log into that
|
||||
host using ftp, and optionally a proxy server to use.
|
||||
If you did not set up DNS when answering
|
||||
the questions to configure networking, you will need to
|
||||
specify an IP address instead of a hostname for the ftp
|
||||
server.
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: defs.h,v 1.66 2001/04/15 11:08:51 itojun Exp $ */
|
||||
/* $NetBSD: defs.h,v 1.67 2001/06/06 23:12:49 scottr Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright 1997 Piermont Information Systems Inc.
|
||||
|
|
@ -212,6 +212,7 @@ EXTERN char ftp_dir[STRSIZE] INIT(STRING(FTP_DIR));
|
|||
EXTERN char ftp_prefix[STRSIZE] INIT("/binary/sets");
|
||||
EXTERN char ftp_user[STRSIZE] INIT("ftp");
|
||||
EXTERN char ftp_pass[STRSIZE] INIT("");
|
||||
EXTERN char ftp_proxy[STRSIZE] INIT("");
|
||||
|
||||
EXTERN char nfs_host[STRSIZE] INIT("");
|
||||
EXTERN char nfs_dir[STRSIZE] INIT("");
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: main.c,v 1.24 2000/12/22 10:12:13 mrg Exp $ */
|
||||
/* $NetBSD: main.c,v 1.25 2001/06/06 23:12:49 scottr Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright 1997 Piermont Information Systems Inc.
|
||||
|
|
@ -256,6 +256,7 @@ static char *ftp_dir_ptr = ftp_dir;
|
|||
static char *ftp_prefix_ptr = ftp_prefix;
|
||||
static char *ftp_user_ptr = ftp_user;
|
||||
static char *ftp_pass_ptr = ftp_pass;
|
||||
static char *ftp_proxy_ptr = ftp_proxy;
|
||||
static char *nfs_host_ptr = nfs_host;
|
||||
static char *nfs_dir_ptr = nfs_dir;
|
||||
static char *cdrom_dev_ptr = cdrom_dev;
|
||||
|
|
@ -278,6 +279,8 @@ struct lookfor fflagopts[] = {
|
|||
STRSIZE, NULL},
|
||||
{"ftp user", "ftp user = %s", "a $0", &ftp_user_ptr, 1, STRSIZE, NULL},
|
||||
{"ftp pass", "ftp pass = %s", "a $0", &ftp_pass_ptr, 1, STRSIZE, NULL},
|
||||
{"ftp proxy", "ftp proxy = %s", "a $0", &ftp_proxy_ptr, 1, STRSIZE,
|
||||
NULL},
|
||||
{"nfs host", "nfs host = %s", "a $0", &nfs_host_ptr, 1, STRSIZE, NULL},
|
||||
{"nfs dir", "ftp dir = %s", "a $0", &nfs_dir_ptr, 1, STRSIZE, NULL},
|
||||
{"cd dev", "cd dev = %s", "a $0", &cdrom_dev_ptr, 1, STRSIZE, NULL},
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: menus.mi.en,v 1.45 2001/01/14 02:38:14 mrg Exp $ */
|
||||
/* $NetBSD: menus.mi.en,v 1.46 2001/06/06 23:12:49 scottr Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright 1997 Piermont Information Systems Inc.
|
||||
|
|
@ -274,7 +274,7 @@ menu ftpsource, title "Change";
|
|||
{ msg_clear();
|
||||
msg_table_add (MSG_ftpsource, ftp_host, ftp_dir, ftp_user,
|
||||
strcmp(ftp_user, "ftp") == 0 ? ftp_pass :
|
||||
strlen(ftp_pass) != 0 ? "** hidden **" : "");
|
||||
strlen(ftp_pass) != 0 ? "** hidden **" : "", ftp_proxy);
|
||||
};
|
||||
option "Host", action
|
||||
{ msg_prompt (MSG_host, ftp_host, ftp_host, 255); };
|
||||
|
|
@ -289,6 +289,13 @@ menu ftpsource, title "Change";
|
|||
msg_prompt_noecho (MSG_passwd, "", ftp_pass, 255);
|
||||
}
|
||||
};
|
||||
option "Proxy", action
|
||||
{ msg_prompt (MSG_proxy, ftp_proxy, ftp_proxy, 255);
|
||||
if (strcmp(ftp_proxy, "") == 0)
|
||||
unsetenv("ftp_proxy");
|
||||
else
|
||||
setenv("ftp_proxy", ftp_proxy, 1);
|
||||
};
|
||||
option "Get Distribution", exit;
|
||||
|
||||
menu nfssource, title "Change";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: menus.mi.fr,v 1.31 2001/01/14 02:38:15 mrg Exp $ */
|
||||
/* $NetBSD: menus.mi.fr,v 1.32 2001/06/06 23:12:49 scottr Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright 1997 Piermont Information Systems Inc.
|
||||
|
|
@ -242,7 +242,8 @@ menu ftpsource, title "Changer";
|
|||
{ msg_clear();
|
||||
msg_table_add (MSG_ftpsource, ftp_host, ftp_dir, ftp_user,
|
||||
strcmp(ftp_user, "ftp") == 0 ? ftp_pass :
|
||||
strlen(ftp_pass) != 0 ? "** caché **" : "");
|
||||
strlen(ftp_pass) != 0 ? "** caché **" : "",
|
||||
ftp_proxy);
|
||||
};
|
||||
option "Serveur ftp", action
|
||||
{ msg_prompt (MSG_host, ftp_host, ftp_host, 255); };
|
||||
|
|
@ -257,6 +258,13 @@ menu ftpsource, title "Changer";
|
|||
msg_prompt_noecho (MSG_passwd, "", ftp_pass, 255);
|
||||
}
|
||||
};
|
||||
option "Proxy", action
|
||||
{ msg_prompt (MSG_proxy, ftp_proxy, ftp_proxy, 255);
|
||||
if (strcmp(ftp_proxy, "") == 0)
|
||||
unsetenv("ftp_proxy");
|
||||
else
|
||||
setenv("ftp_proxy", ftp_proxy, 1);
|
||||
};
|
||||
option "Récupérer la Distribution", exit;
|
||||
|
||||
menu nfssource, title "Changer";
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: msg.mi.en,v 1.82 2001/04/25 02:33:10 simonb Exp $ */
|
||||
/* $NetBSD: msg.mi.en,v 1.83 2001/06/06 23:12:49 scottr Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright 1997 Piermont Information Systems Inc.
|
||||
|
|
@ -398,6 +398,7 @@ host: %s
|
|||
directory: %s
|
||||
user: %s
|
||||
password: %s
|
||||
proxy: %s
|
||||
}
|
||||
|
||||
message host
|
||||
|
|
@ -412,6 +413,9 @@ message user
|
|||
message passwd
|
||||
{password}
|
||||
|
||||
message proxy
|
||||
{proxy}
|
||||
|
||||
message email
|
||||
{e-mail address}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: msg.mi.fr,v 1.40 2001/01/14 02:38:15 mrg Exp $ */
|
||||
/* $NetBSD: msg.mi.fr,v 1.41 2001/06/06 23:12:50 scottr Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright 1997 Piermont Information Systems Inc.
|
||||
|
|
@ -392,6 +392,7 @@ serveur: %s
|
|||
répertoire: %s
|
||||
utilisateur: %s
|
||||
mot de passe: %s
|
||||
proxy: %s
|
||||
}
|
||||
|
||||
message host
|
||||
|
|
@ -406,6 +407,9 @@ message user
|
|||
message passwd
|
||||
{mot de passe}
|
||||
|
||||
message proxy
|
||||
{proxy}
|
||||
|
||||
message email
|
||||
{ adresse e-mail }
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue