tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- markus@cvs.openbsd.org 2003/02/06 09:27:29 

[ssh.c ssh_config.5]
     support 'ProxyCommand none'; bugzilla #433; binder@arago.de; ok djm@
This commit is contained in:
Damien Miller 2003-02-24 11:57:32 +11:00
parent 97f39ae810
commit 9f1e33a6b2
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -45,6 +45,9 @@
- markus@cvs.openbsd.org 2003/02/06 09:26:23 - markus@cvs.openbsd.org 2003/02/06 09:26:23
[session.c] [session.c]
missing call to setproctitle() after authentication; ok provos@ missing call to setproctitle() after authentication; ok provos@
- markus@cvs.openbsd.org 2003/02/06 09:27:29
[ssh.c ssh_config.5]
support 'ProxyCommand none'; bugzilla #433; binder@arago.de; ok djm@
20030211 20030211
- (djm) Cygwin needs libcrypt too. Patch from vinschen@redhat.com - (djm) Cygwin needs libcrypt too. Patch from vinschen@redhat.com
@ -1145,4 +1148,4 @@
save auth method before monitor_reset_key_state(); bugzilla bug #284; save auth method before monitor_reset_key_state(); bugzilla bug #284;
ok provos@ ok provos@
$Id: ChangeLog,v 1.2605 2003/02/24 00:57:01 djm Exp $ $Id: ChangeLog,v 1.2606 2003/02/24 00:57:32 djm Exp $

6
ssh.c
View File

@ -40,7 +40,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: ssh.c,v 1.189 2002/12/09 16:50:30 millert Exp $"); RCSID("$OpenBSD: ssh.c,v 1.190 2003/02/06 09:27:29 markus Exp $");
#include <openssl/evp.h> #include <openssl/evp.h>
#include <openssl/err.h> #include <openssl/err.h>
@ -601,6 +601,10 @@ again:
if (options.hostname != NULL) if (options.hostname != NULL)
host = options.hostname; host = options.hostname;
if (options.proxy_command != NULL &&
strcmp(options.proxy_command, "none") == 0)
options.proxy_command = NULL;
/* Disable rhosts authentication if not running as root. */ /* Disable rhosts authentication if not running as root. */
#ifdef HAVE_CYGWIN #ifdef HAVE_CYGWIN
/* Ignore uid if running under Windows */ /* Ignore uid if running under Windows */

5
ssh_config.5
View File

@ -34,7 +34,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\" .\"
.\" $OpenBSD: ssh_config.5,v 1.5 2002/08/29 22:54:10 stevesk Exp $ .\" $OpenBSD: ssh_config.5,v 1.6 2003/02/06 09:27:29 markus Exp $
.Dd September 25, 1999 .Dd September 25, 1999
.Dt SSH_CONFIG 5 .Dt SSH_CONFIG 5
.Os .Os
@ -474,6 +474,9 @@ somewhere.
Host key management will be done using the Host key management will be done using the
HostName of the host being connected (defaulting to the name typed by HostName of the host being connected (defaulting to the name typed by
the user). the user).
Setting the command to
.Dq none
disables this option entirely.
Note that Note that
.Cm CheckHostIP .Cm CheckHostIP
is not available for connects with a proxy command. is not available for connects with a proxy command.