===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/sftp.c,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- src/usr.bin/ssh/sftp.c	2009/08/12 00:13:00	1.108
+++ src/usr.bin/ssh/sftp.c	2009/08/13 01:11:19	1.109
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp.c,v 1.108 2009/08/12 00:13:00 djm Exp $ */
+/* $OpenBSD: sftp.c,v 1.109 2009/08/13 01:11:19 djm Exp $ */
 /*
  * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
  *
@@ -1660,7 +1660,8 @@
 	ll = SYSLOG_LEVEL_INFO;
 	infile = stdin;
 
-	while ((ch = getopt(argc, argv, "1246hqvCc:i:o:s:S:b:B:F:P:R:")) != -1) {
+	while ((ch = getopt(argc, argv,
+	    "1246hqvCc:D:i:o:s:S:b:B:F:P:R:")) != -1) {
 		switch (ch) {
 		/* Passed through to ssh(1) */
 		case '4':
@@ -1679,6 +1680,9 @@
 			showprogress = 0;
 			addargs(&args, "-%c", ch);
 			break;
+		case 'P':
+			addargs(&args, "-oPort %s", optarg);
+			break;
 		case 'v':
 			if (debug_level < 3) {
 				addargs(&args, "-v");
@@ -1711,7 +1715,7 @@
 			batchmode = 1;
 			addargs(&args, "-obatchmode yes");
 			break;
-		case 'P':
+		case 'D':
 			sftp_direct = optarg;
 			break;
 		case 'R':