From 8cae676a35b11e7d42ab90bbfc9605be56519d1f Mon Sep 17 00:00:00 2001
From: "job@openbsd.org" <job@openbsd.org>
Date: Thu, 3 Sep 2026 16:02:45 +0000
Subject: [PATCH] upstream: Remove scp '-s' flag from synopsis, the flag has
 been a

no-op for some time now

OK djm@

OpenBSD-Commit-ID: c272de443c8fb72f470a5e1fa482d5dae5536e85
---
 scp.1 | 6 +++---
 scp.c | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/scp.1 b/scp.1
index 7bce0fe6f..6daf59420 100644
--- a/scp.1
+++ b/scp.1
@@ -8,9 +8,9 @@
 .\"
 .\" Created: Sun May  7 00:14:37 1995 ylo
 .\"
-.\" $OpenBSD: scp.1,v 1.115 2025/10/04 21:41:35 naddy Exp $
+.\" $OpenBSD: scp.1,v 1.116 2026/09/03 16:02:45 job Exp $
 .\"
-.Dd $Mdocdate: October 4 2025 $
+.Dd $Mdocdate: September 3 2026 $
 .Dt SCP 1
 .Os
 .Sh NAME
@@ -18,7 +18,7 @@
 .Nd OpenSSH secure file copy
 .Sh SYNOPSIS
 .Nm scp
-.Op Fl 346ABCOpqRrsTv
+.Op Fl 346ABCOpqRrTv
 .Op Fl c Ar cipher
 .Op Fl D Ar sftp_server_path
 .Op Fl F Ar ssh_config
diff --git a/scp.c b/scp.c
index 28ac7a29d..5c779b92d 100644
--- a/scp.c
+++ b/scp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: scp.c,v 1.275 2026/06/28 23:47:16 djm Exp $ */
+/* $OpenBSD: scp.c,v 1.276 2026/09/03 16:02:45 job Exp $ */
 /*
  * scp - secure remote copy.  This is basically patched BSD rcp which
  * uses ssh to do the data transfer (instead of using rcmd).
@@ -527,7 +527,7 @@ main(int argc, char **argv)
 			mode = MODE_SCP;
 			break;
 		case 's':
-			mode = MODE_SFTP;
+			/* Ignored */
 			break;
 		case 'P':
 			sshport = a2port(optarg);
@@ -2116,7 +2116,7 @@ void
 usage(void)
 {
 	(void) fprintf(stderr,
-	    "usage: scp [-346ABCOpqRrsTv] [-c cipher] [-D sftp_server_path] [-F ssh_config]\n"
+	    "usage: scp [-346ABCOpqRrTv] [-c cipher] [-D sftp_server_path] [-F ssh_config]\n"
 	    "           [-i identity_file] [-J destination] [-l limit] [-o ssh_option]\n"
 	    "           [-P port] [-S program] [-X sftp_option] source ... target\n");
 	exit(1);