diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ssh.c | 6 | ||||
-rw-r--r-- | ssh_config.5 | 5 |
3 files changed, 13 insertions, 3 deletions
@@ -45,6 +45,9 @@ | |||
45 | - markus@cvs.openbsd.org 2003/02/06 09:26:23 | 45 | - markus@cvs.openbsd.org 2003/02/06 09:26:23 |
46 | [session.c] | 46 | [session.c] |
47 | missing call to setproctitle() after authentication; ok provos@ | 47 | missing call to setproctitle() after authentication; ok provos@ |
48 | - markus@cvs.openbsd.org 2003/02/06 09:27:29 | ||
49 | [ssh.c ssh_config.5] | ||
50 | support 'ProxyCommand none'; bugzilla #433; binder@arago.de; ok djm@ | ||
48 | 51 | ||
49 | 20030211 | 52 | 20030211 |
50 | - (djm) Cygwin needs libcrypt too. Patch from vinschen@redhat.com | 53 | - (djm) Cygwin needs libcrypt too. Patch from vinschen@redhat.com |
@@ -1145,4 +1148,4 @@ | |||
1145 | save auth method before monitor_reset_key_state(); bugzilla bug #284; | 1148 | save auth method before monitor_reset_key_state(); bugzilla bug #284; |
1146 | ok provos@ | 1149 | ok provos@ |
1147 | 1150 | ||
1148 | $Id: ChangeLog,v 1.2605 2003/02/24 00:57:01 djm Exp $ | 1151 | $Id: ChangeLog,v 1.2606 2003/02/24 00:57:32 djm Exp $ |
@@ -40,7 +40,7 @@ | |||
40 | */ | 40 | */ |
41 | 41 | ||
42 | #include "includes.h" | 42 | #include "includes.h" |
43 | RCSID("$OpenBSD: ssh.c,v 1.189 2002/12/09 16:50:30 millert Exp $"); | 43 | RCSID("$OpenBSD: ssh.c,v 1.190 2003/02/06 09:27:29 markus Exp $"); |
44 | 44 | ||
45 | #include <openssl/evp.h> | 45 | #include <openssl/evp.h> |
46 | #include <openssl/err.h> | 46 | #include <openssl/err.h> |
@@ -601,6 +601,10 @@ again: | |||
601 | if (options.hostname != NULL) | 601 | if (options.hostname != NULL) |
602 | host = options.hostname; | 602 | host = options.hostname; |
603 | 603 | ||
604 | if (options.proxy_command != NULL && | ||
605 | strcmp(options.proxy_command, "none") == 0) | ||
606 | options.proxy_command = NULL; | ||
607 | |||
604 | /* Disable rhosts authentication if not running as root. */ | 608 | /* Disable rhosts authentication if not running as root. */ |
605 | #ifdef HAVE_CYGWIN | 609 | #ifdef HAVE_CYGWIN |
606 | /* Ignore uid if running under Windows */ | 610 | /* Ignore uid if running under Windows */ |
diff --git a/ssh_config.5 b/ssh_config.5 index ac05a0cea..710c068c5 100644 --- a/ssh_config.5 +++ b/ssh_config.5 | |||
@@ -34,7 +34,7 @@ | |||
34 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 34 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
35 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 35 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
36 | .\" | 36 | .\" |
37 | .\" $OpenBSD: ssh_config.5,v 1.5 2002/08/29 22:54:10 stevesk Exp $ | 37 | .\" $OpenBSD: ssh_config.5,v 1.6 2003/02/06 09:27:29 markus Exp $ |
38 | .Dd September 25, 1999 | 38 | .Dd September 25, 1999 |
39 | .Dt SSH_CONFIG 5 | 39 | .Dt SSH_CONFIG 5 |
40 | .Os | 40 | .Os |
@@ -474,6 +474,9 @@ somewhere. | |||
474 | Host key management will be done using the | 474 | Host key management will be done using the |
475 | HostName of the host being connected (defaulting to the name typed by | 475 | HostName of the host being connected (defaulting to the name typed by |
476 | the user). | 476 | the user). |
477 | Setting the command to | ||
478 | .Dq none | ||
479 | disables this option entirely. | ||
477 | Note that | 480 | Note that |
478 | .Cm CheckHostIP | 481 | .Cm CheckHostIP |
479 | is not available for connects with a proxy command. | 482 | is not available for connects with a proxy command. |