diff options
| author | Dug Song <dugsong@cvs.openbsd.org> | 1999-09-29 18:16:24 +0000 |
|---|---|---|
| committer | Dug Song <dugsong@cvs.openbsd.org> | 1999-09-29 18:16:24 +0000 |
| commit | 18b0e3d63d164640aae60cdba4b8171c56a9e1f1 (patch) | |
| tree | c6a16fe7937f965dd34829c6c0effc5b80c2ba77 /usr.bin/ssh/scp.c | |
| parent | 0d39821d0d77161333749fc800238b94cde1aef0 (diff) | |
update krb4/AFS support to ssh-1.2.27-afs-kerberos-pl1 level, clean up unused variables, update manpages
Diffstat (limited to 'usr.bin/ssh/scp.c')
| -rw-r--r-- | usr.bin/ssh/scp.c | 24 |
1 files changed, 3 insertions, 21 deletions
diff --git a/usr.bin/ssh/scp.c b/usr.bin/ssh/scp.c index 8ab7174840f..e6667029eff 100644 --- a/usr.bin/ssh/scp.c +++ b/usr.bin/ssh/scp.c @@ -42,11 +42,11 @@ and ssh has the necessary privileges.) * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: scp.c,v 1.1 1999/09/26 20:53:37 deraadt Exp $ + * $Id: scp.c,v 1.2 1999/09/29 18:16:20 dugsong Exp $ */ #include "includes.h" -RCSID("$Id: scp.c,v 1.1 1999/09/26 20:53:37 deraadt Exp $"); +RCSID("$Id: scp.c,v 1.2 1999/09/29 18:16:20 dugsong Exp $"); #include "ssh.h" #include "xmalloc.h" @@ -78,11 +78,6 @@ struct utimbuf #define STDERR_FILENO 2 #endif -#if defined(KERBEROS_TGT_PASSING) || defined(AFS) -/* This is set to non-zero to disable authentication forwarding. */ -int nofwd = 0; -#endif - /* This is set to non-zero to enable verbose mode. */ int verbose = 0; @@ -153,10 +148,6 @@ int do_cmd(char *host, char *remuser, char *cmd, int *fdin, int *fdout) args[i++] = "-C"; if (batchmode) args[i++] = "-oBatchMode yes"; -#if defined(KERBEROS_TGT_PASSING) || defined(AFS) - if (nofwd) - args[i++] = "-k"; -#endif if (cipher != NULL) { args[i++] = "-c"; @@ -251,11 +242,7 @@ main(argc, argv) extern int optind; fflag = tflag = 0; -#if defined(KERBEROS_TGT_PASSING) || defined(AFS) - while ((ch = getopt(argc, argv, "kdfprtvBCc:i:P:")) != EOF) -#else while ((ch = getopt(argc, argv, "dfprtvBCc:i:P:")) != EOF) -#endif switch(ch) { /* User-visible flags. */ case 'p': pflag = 1; @@ -267,11 +254,6 @@ main(argc, argv) iamrecursive = 1; break; /* Server options. */ -#if defined(KERBEROS_TGT_PASSING) || defined(AFS) - case 'k': - nofwd = 1; - break; -#endif case 'd': targetshouldbedirectory = 1; break; @@ -975,7 +957,7 @@ run_err(const char *fmt, ...) * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: scp.c,v 1.1 1999/09/26 20:53:37 deraadt Exp $ + * $Id: scp.c,v 1.2 1999/09/29 18:16:20 dugsong Exp $ */ char * |