summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--session.c4
-rw-r--r--ssh.16
3 files changed, 10 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 0ee6df733..a167dfea1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,10 @@
13 - dtucker@cvs.openbsd.org 2008/11/07 23:34:48 13 - dtucker@cvs.openbsd.org 2008/11/07 23:34:48
14 [auth2-jpake.c] 14 [auth2-jpake.c]
15 Move JPAKE define to make life easier for portable. ok djm@ 15 Move JPAKE define to make life easier for portable. ok djm@
16 - tobias@cvs.openbsd.org 2008/11/09 12:34:47
17 [session.c ssh.1]
18 typo fixed (overriden -> overridden)
19 ok espie, jmc
16 20
1720081105 2120081105
18 - OpenBSD CVS Sync 22 - OpenBSD CVS Sync
@@ -4905,4 +4909,4 @@
4905 OpenServer 6 and add osr5bigcrypt support so when someone migrates 4909 OpenServer 6 and add osr5bigcrypt support so when someone migrates
4906 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 4910 passwords between UnixWare and OpenServer they will still work. OK dtucker@
4907 4911
4908$Id: ChangeLog,v 1.5136 2008/11/11 05:33:03 dtucker Exp $ 4912$Id: ChangeLog,v 1.5137 2008/11/11 05:33:48 dtucker Exp $
diff --git a/session.c b/session.c
index 4bed28d7f..c61aeb711 100644
--- a/session.c
+++ b/session.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: session.c,v 1.243 2008/10/02 14:39:35 millert Exp $ */ 1/* $OpenBSD: session.c,v 1.244 2008/11/09 12:34:47 tobias Exp $ */
2/* 2/*
3 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 3 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
4 * All rights reserved 4 * All rights reserved
@@ -932,7 +932,7 @@ check_quietlogin(Session *s, const char *command)
932 932
933/* 933/*
934 * Sets the value of the given variable in the environment. If the variable 934 * Sets the value of the given variable in the environment. If the variable
935 * already exists, its value is overriden. 935 * already exists, its value is overridden.
936 */ 936 */
937void 937void
938child_set_env(char ***envp, u_int *envsizep, const char *name, 938child_set_env(char ***envp, u_int *envsizep, const char *name,
diff --git a/ssh.1 b/ssh.1
index 5f55dfe9d..b66a1c342 100644
--- a/ssh.1
+++ b/ssh.1
@@ -34,8 +34,8 @@
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.1,v 1.279 2008/11/05 03:23:09 stevesk Exp $ 37.\" $OpenBSD: ssh.1,v 1.280 2008/11/09 12:34:47 tobias Exp $
38.Dd $Mdocdate: November 5 2008 $ 38.Dd $Mdocdate: November 9 2008 $
39.Dt SSH 1 39.Dt SSH 1
40.Os 40.Os
41.Sh NAME 41.Sh NAME
@@ -550,7 +550,7 @@ using an alternative syntax:
550.Pp 550.Pp
551By default, the listening socket on the server will be bound to the loopback 551By default, the listening socket on the server will be bound to the loopback
552interface only. 552interface only.
553This may be overriden by specifying a 553This may be overridden by specifying a
554.Ar bind_address . 554.Ar bind_address .
555An empty 555An empty
556.Ar bind_address , 556.Ar bind_address ,