From 0ef51c20cfd142da1bd87ec57adcae743d656f7f Mon Sep 17 00:00:00 2001 From: Johan Danielsson Date: Wed, 12 Oct 2005 09:42:47 +0000 Subject: [PATCH] add -x (encrypt) option git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@16160 ec53bebd-3082-4978-b11e-865c3cabbd6b --- appl/ftp/ftp/ftp_var.h | 1 + appl/ftp/ftp/globals.c | 1 + appl/ftp/ftp/main.c | 2 ++ 3 files changed, 4 insertions(+) diff --git a/appl/ftp/ftp/ftp_var.h b/appl/ftp/ftp/ftp_var.h index 3dbe6b44a..75ec495b7 100644 --- a/appl/ftp/ftp/ftp_var.h +++ b/appl/ftp/ftp/ftp_var.h @@ -57,6 +57,7 @@ extern int debug; /* debugging level */ extern int bell; /* ring bell on cmd completion */ extern int doglob; /* glob local file names */ extern int autologin; /* establish user account on connection */ +extern int doencrypt; extern int proxy; /* proxy server connection active */ extern int proxflag; /* proxy connection exists */ extern int sunique; /* store files on server with unique name */ diff --git a/appl/ftp/ftp/globals.c b/appl/ftp/ftp/globals.c index 1b9550040..0531ef152 100644 --- a/appl/ftp/ftp/globals.c +++ b/appl/ftp/ftp/globals.c @@ -15,6 +15,7 @@ int lineedit; /* use line-editing */ int debug; /* debugging level */ int bell; /* ring bell on cmd completion */ int doglob; /* glob local file names */ +int doencrypt; /* try to use encryption */ int autologin; /* establish user account on connection */ int proxy; /* proxy server connection active */ int proxflag; /* proxy connection exists */ diff --git a/appl/ftp/ftp/main.c b/appl/ftp/ftp/main.c index 44a55d664..b04d1c62f 100644 --- a/appl/ftp/ftp/main.c +++ b/appl/ftp/ftp/main.c @@ -69,6 +69,8 @@ struct getargs getargs[] = { "verbosity", NULL}, { NULL, 'K', arg_negative_flag, &use_kerberos, "Disable kerberos authentication", NULL}, + { "encrypt", 'x', arg_flag, &doencrypt, + "Encrypt command and data channel if possible" }, { "version", 0, arg_flag, &version_flag }, { "help", 'h', arg_flag, &help_flag }, };