--- a/cli-runopts.c
+++ b/cli-runopts.c
-@@ -296,6 +296,8 @@ void cli_getopts(int argc, char ** argv)
- debug_trace = 1;
+@@ -325,6 +325,10 @@ void cli_getopts(int argc, char ** argv)
+ case 'b':
+ next = &bind_arg;
break;
- #endif
+ case 'x':
++ /* compatibility with openssh cli
++ * ("-x" disables X11 forwarding) */
+ break;
- case 'F':
- case 'e':
- #ifndef ENABLE_USER_ALGO_LIST
+ default:
+ fprintf(stderr,
+ "WARNING: Ignoring unknown option -%c\n", c);