=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/ssh.c,v retrieving revision 1.383 retrieving revision 1.384 diff -u -r1.383 -r1.384 --- src/usr.bin/ssh/ssh.c 2013/10/14 23:28:23 1.383 +++ src/usr.bin/ssh/ssh.c 2013/10/14 23:31:01 1.384 @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh.c,v 1.383 2013/10/14 23:28:23 djm Exp $ */ +/* $OpenBSD: ssh.c,v 1.384 2013/10/14 23:31:01 djm Exp $ */ /* * Author: Tatu Ylonen * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -775,7 +775,7 @@ /* Open a connection to the remote host. */ if (ssh_connect(host, &hostaddr, options.port, options.address_family, options.connection_attempts, &timeout_ms, - options.tcp_keep_alive, + options.tcp_keep_alive, original_effective_uid == 0 && options.use_privileged_port, options.proxy_command) != 0) exit(255); @@ -1027,7 +1027,7 @@ if (stdio_forward_host == NULL) return; - if (!compat20) + if (!compat20) fatal("stdio forwarding require Protocol 2"); debug3("%s: %s:%d", __func__, stdio_forward_host, stdio_forward_port); @@ -1199,7 +1199,7 @@ char *proto, *data; /* Get reasonable local authentication information. */ client_x11_get_proto(display, options.xauth_location, - options.forward_x11_trusted, + options.forward_x11_trusted, options.forward_x11_timeout, &proto, &data); /* Request forwarding with authentication spoofing. */