===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/scp.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- src/usr.bin/ssh/scp.c	1999/09/26 20:53:37	1.1
+++ src/usr.bin/ssh/scp.c	1999/09/29 18:16:20	1.2
@@ -42,11 +42,11 @@
  * 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 @@
 #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 @@
 	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 @@
 	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 @@
 			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 @@
  * 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 *