Debian release 3.6.1p1-1.

39 files changed, 217 insertions, 127 deletions

diff --git a/ChangeLog b/ChangeLog
index 9a7e2ea93..ebde74795 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,20 +1,58 @@
+20030401
+ - (djm) OpenBSD CVS Sync
+   - jmc@cvs.openbsd.org 2003/03/28 10:11:43
+     [scp.1 sftp.1 ssh.1 ssh-add.1 ssh-agent.1 ssh_config.5 sshd_config.5]
+     [ssh-keygen.1 ssh-keyscan.1 ssh-keysign.8]
+     - killed whitespace
+     - new sentence new line
+     - .Bk for arguments
+     ok markus@
+   - markus@cvs.openbsd.org 2003/04/01 10:10:23
+     [clientloop.c monitor.c monitor_wrap.c packet.c packet.h readconf.c]
+     [readconf.h serverloop.c sshconnect2.c]
+     rekeying bugfixes and automatic rekeying:
+     * both client and server rekey _automatically_
+           (a) after 2^31 packets, because after 2^32 packets
+               the sequence number for packets wraps
+           (b) after 2^(blocksize_in_bits/4) blocks
+       (see: draft-ietf-secsh-newmodes-00.txt)
+       (a) and (b) are _enabled_ by default, and only disabled for known
+       openssh versions, that don't support rekeying properly.
+     * client option 'RekeyLimit'
+     * do not reply to requests during rekeying
+   - markus@cvs.openbsd.org 2003/04/01 10:22:21
+     [clientloop.c monitor.c monitor_wrap.c packet.c packet.h readconf.c]
+     [readconf.h serverloop.c sshconnect2.c]
+     backout rekeying changes (for 3.6.1)
+   - markus@cvs.openbsd.org 2003/04/01 10:31:26
+     [compat.c compat.h kex.c]
+     bugfix causes stalled connections for ssh.com < 3.0; noticed by ho@; 
+     tested by ho@ and myself
+   - markus@cvs.openbsd.org 2003/04/01 10:56:46
+     [version.h]
+     3.6.1
+ - (djm) Crank spec file versions
+ - (djm) Release 3.6.1p1
+
 20030326
  - (djm) OpenBSD CVS Sync
    - deraadt@cvs.openbsd.org 2003/03/26 04:02:51
      [sftp-server.c]
      one last fix to the tree: race fix broke stuff; pr 3169; 
      srp@srparish.net, help from djm
+
+20030325
  - (djm) Fix getpeerid support for 64 bit BE systems. From 
     Arnd Bergmann <arndb@de.ibm.com>
- - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
-   Report from murple@murple.net, diagnosis from dtucker@zip.com.au
- - Release 3.6p1
 
 20030324
  - (djm) OpenBSD CVS Sync
    - markus@cvs.openbsd.org 2003/03/23 19:02:00
      [monitor.c]
      unbreak rekeying for privsep; ok millert@
+ - Release 3.6p1
+ - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
+   Report from murple@murple.net, diagnosis from dtucker@zip.com.au
 
 20030320
  - (djm) OpenBSD CVS Sync
@@ -29,10 +67,9 @@
  - (bal) Collection of Cray patches (bsd-cray.h fix for CRAYT3E and improved
    guessing rules)
  - (bal) Disable Privsep for Tru64 after pre-authentication due to issues
-   with SIA.  Also, clean up of tru64 support patch by Chris Adams 
+   with SIA.  Also, clean up of tru64 support patch by Chris Adams
    <cmadams@hiwaay.net>
  - (tim) [contrib/caldera/openssh.spec] workaround RPM quirk. Fix %files
-   section.
 
 20030318
  - (tim) [configure.ac openbsd-compat/bsd-misc.c openbsd-compat/bsd-misc.h]
@@ -1258,4 +1295,4 @@
      save auth method before monitor_reset_key_state(); bugzilla bug #284;
      ok provos@
 
-$Id: ChangeLog,v 1.2633.2.9 2003/03/26 05:03:05 djm Exp $
+$Id: ChangeLog,v 1.2648 2003/04/01 11:47:16 djm Exp $
diff --git a/Makefile.in b/Makefile.in
index b94eae158..6702eb96e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 1.227.2.1 2003/03/21 00:51:35 mouring Exp $
+# $Id: Makefile.in,v 1.228 2003/03/21 00:34:34 mouring Exp $
 
 # uncomment if you run a non bourne compatable shell. Ie. csh
 #SHELL = @SH@
diff --git a/README.privsep b/README.privsep
index e92af2c41..e8bf1db34 100644
--- a/README.privsep
+++ b/README.privsep
@@ -62,4 +62,4 @@ process 1005 is the sshd process listening for new connections.
 process 6917 is the privileged monitor process, 6919 is the user owned
 sshd process and 6921 is the shell process.
 
-$Id: README.privsep,v 1.10.6.1 2003/03/21 01:15:18 mouring Exp $
+$Id: README.privsep,v 1.11 2003/03/21 01:18:09 mouring Exp $
diff --git a/clientloop.c b/clientloop.c
index abfde2f3a..9549dadd4 100644
--- a/clientloop.c
+++ b/clientloop.c
@@ -59,7 +59,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: clientloop.c,v 1.105 2002/11/18 16:43:44 markus Exp $");
+RCSID("$OpenBSD: clientloop.c,v 1.107 2003/04/01 10:22:21 markus Exp $");
 
 #include "ssh.h"
 #include "ssh1.h"
diff --git a/compat.c b/compat.c
index 757b0e679..5e1774ab6 100644
--- a/compat.c
+++ b/compat.c
@@ -23,7 +23,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: compat.c,v 1.65 2002/09/27 10:42:09 mickey Exp $");
+RCSID("$OpenBSD: compat.c,v 1.66 2003/04/01 10:31:26 markus Exp $");
 
 #include "buffer.h"
 #include "packet.h"
@@ -85,10 +85,12 @@ compat_datafellows(const char *version)
                 { "*MindTerm*",         0 },
                 { "2.1.0*",             SSH_BUG_SIGBLOB|SSH_BUG_HMAC|
                                         SSH_OLD_SESSIONID|SSH_BUG_DEBUG|
-                                        SSH_BUG_RSASIGMD5|SSH_BUG_HBSERVICE },
+                                        SSH_BUG_RSASIGMD5|SSH_BUG_HBSERVICE|
+                                        SSH_BUG_FIRSTKEX },
                 { "2.1 *",              SSH_BUG_SIGBLOB|SSH_BUG_HMAC|
                                         SSH_OLD_SESSIONID|SSH_BUG_DEBUG|
-                                        SSH_BUG_RSASIGMD5|SSH_BUG_HBSERVICE },
+                                        SSH_BUG_RSASIGMD5|SSH_BUG_HBSERVICE|
+                                        SSH_BUG_FIRSTKEX },
                 { "2.0.13*,"
                   "2.0.14*,"
                   "2.0.15*,"
@@ -100,26 +102,28 @@ compat_datafellows(const char *version)
                                         SSH_BUG_PKSERVICE|SSH_BUG_X11FWD|
                                         SSH_BUG_PKOK|SSH_BUG_RSASIGMD5|
                                         SSH_BUG_HBSERVICE|SSH_BUG_OPENFAILURE|
-                                        SSH_BUG_DUMMYCHAN },
+                                        SSH_BUG_DUMMYCHAN|SSH_BUG_FIRSTKEX },
                 { "2.0.11*,"
                   "2.0.12*",            SSH_BUG_SIGBLOB|SSH_BUG_HMAC|
                                         SSH_OLD_SESSIONID|SSH_BUG_DEBUG|
                                         SSH_BUG_PKSERVICE|SSH_BUG_X11FWD|
                                         SSH_BUG_PKAUTH|SSH_BUG_PKOK|
                                         SSH_BUG_RSASIGMD5|SSH_BUG_OPENFAILURE|
-                                        SSH_BUG_DUMMYCHAN },
+                                        SSH_BUG_DUMMYCHAN|SSH_BUG_FIRSTKEX },
                 { "2.0.*",              SSH_BUG_SIGBLOB|SSH_BUG_HMAC|
                                         SSH_OLD_SESSIONID|SSH_BUG_DEBUG|
                                         SSH_BUG_PKSERVICE|SSH_BUG_X11FWD|
                                         SSH_BUG_PKAUTH|SSH_BUG_PKOK|
                                         SSH_BUG_RSASIGMD5|SSH_BUG_OPENFAILURE|
-                                        SSH_BUG_DERIVEKEY|SSH_BUG_DUMMYCHAN },
+                                        SSH_BUG_DERIVEKEY|SSH_BUG_DUMMYCHAN|
+                                        SSH_BUG_FIRSTKEX },
                 { "2.2.0*,"
                   "2.3.0*",             SSH_BUG_HMAC|SSH_BUG_DEBUG|
-                                        SSH_BUG_RSASIGMD5 },
-                { "2.3.*",              SSH_BUG_DEBUG|SSH_BUG_RSASIGMD5 },
+                                        SSH_BUG_RSASIGMD5|SSH_BUG_FIRSTKEX },
+                { "2.3.*",              SSH_BUG_DEBUG|SSH_BUG_RSASIGMD5|
+                                        SSH_BUG_FIRSTKEX },
                 { "2.4",                SSH_OLD_SESSIONID },    /* Van Dyke */
-                { "2.*",                SSH_BUG_DEBUG },
+                { "2.*",                SSH_BUG_DEBUG|SSH_BUG_FIRSTKEX },
                 { "3.0.*",              SSH_BUG_DEBUG },
                 { "3.0 SecureCRT*",     SSH_OLD_SESSIONID },
                 { "1.7 SecureFX*",      SSH_OLD_SESSIONID },
diff --git a/compat.h b/compat.h
index 9299805af..881e450d3 100644
--- a/compat.h
+++ b/compat.h
@@ -1,4 +1,4 @@
-/*      $OpenBSD: compat.h,v 1.33 2002/09/27 10:42:09 mickey Exp $      */
+/*      $OpenBSD: compat.h,v 1.34 2003/04/01 10:31:26 markus Exp $      */
 
 /*
  * Copyright (c) 1999, 2000, 2001 Markus Friedl.  All rights reserved.
@@ -55,6 +55,7 @@
 #define SSH_BUG_EXTEOF          0x00200000
 #define SSH_BUG_K5USER          0x00400000
 #define SSH_BUG_PROBE           0x00800000
+#define SSH_BUG_FIRSTKEX        0x01000000
 
 void     enable_compat13(void);
 void     enable_compat20(void);
diff --git a/configure.ac b/configure.ac
index 48a98d319..47fef0cbe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.111.2.2 2003/03/21 01:15:18 mouring Exp $
+# $Id: configure.ac,v 1.113 2003/03/21 01:18:09 mouring Exp $
 
 AC_INIT
 AC_CONFIG_SRCDIR([ssh.c])
diff --git a/contrib/caldera/openssh.spec b/contrib/caldera/openssh.spec
index e70ac8f37..142d30d88 100644
--- a/contrib/caldera/openssh.spec
+++ b/contrib/caldera/openssh.spec
@@ -17,7 +17,7 @@
 #old cvs stuff.  please update before use.  may be deprecated.
 %define use_stable      1
 %if %{use_stable}
-  %define version       3.6p1
+  %define version       3.6.1p1
   %define cvs           %{nil}
   %define release       2
 %else
@@ -364,4 +364,4 @@ fi
 * Mon Jan 01 1998 ...
 Template Version: 1.31
 
-$Id: openssh.spec,v 1.39.2.2 2003/03/21 04:52:56 tim Exp $
+$Id: openssh.spec,v 1.42 2003/04/01 11:46:53 djm Exp $
diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec
index f71c0b261..7488357fb 100644
--- a/contrib/redhat/openssh.spec
+++ b/contrib/redhat/openssh.spec
@@ -1,4 +1,4 @@
-%define ver 3.6p1
+%define ver 3.6.1p1
 %define rel 1
 
 # OpenSSH privilege separation requires a user & group ID
diff --git a/contrib/suse/openssh.spec b/contrib/suse/openssh.spec
index 55de013dc..194dbb7d1 100644
--- a/contrib/suse/openssh.spec
+++ b/contrib/suse/openssh.spec
@@ -1,6 +1,6 @@
 Summary: OpenSSH, a free Secure Shell (SSH) protocol implementation
 Name: openssh
-Version: 3.6p1
+Version: 3.6.1p1
 URL: http://www.openssh.com/
 Release: 1
 Source0: openssh-%{version}.tar.gz
diff --git a/debian/changelog b/debian/changelog
index 532567f8d..cc9ad5184 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+openssh (1:3.6.1p1-1) unstable; urgency=low
+
+  * New upstream release (thanks, Laurence J. Lane).
+  * debian/control: ssh-askpass-gnome is now Section: gnome, following the
+    override file.
+
+ -- Colin Watson <cjwatson@debian.org>  Wed,  2 Apr 2003 00:51:02 +0100
+
 openssh (1:3.6p1-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 5a69855e2..1cfb93d58 100644
--- a/debian/control
+++ b/debian/control
@@ -33,7 +33,7 @@ Description: Secure rlogin/rsh/rcp replacement (OpenSSH)
  be illegal to use any encryption at all without a special permit.
 
 Package: ssh-askpass-gnome
-Section: x11
+Section: gnome
 Priority: optional
 Architecture: any
 Depends: ${shlibs:Depends}, ssh (>=1:1.2pre7-4) | ssh-krb5
diff --git a/kex.c b/kex.c
index 2c1cacfec..b070ccf42 100644
--- a/kex.c
+++ b/kex.c
@@ -23,7 +23,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: kex.c,v 1.54 2003/02/16 17:09:57 markus Exp $");
+RCSID("$OpenBSD: kex.c,v 1.55 2003/04/01 10:31:26 markus Exp $");
 
 #include <openssl/crypto.h>
 
@@ -392,7 +392,8 @@ kex_choose_conf(Kex *kex)
         kex->we_need = need;
 
         /* ignore the next message if the proposals do not match */
-        if (first_kex_follows && !proposals_match(my, peer)) {
+        if (first_kex_follows && !proposals_match(my, peer) && 
+           !(datafellows & SSH_BUG_FIRSTKEX)) {
                 type = packet_read();
                 debug2("skipping next packet (type %u)", type);
         }
diff --git a/monitor.c b/monitor.c
index 3d7dcaf86..bcd007e60 100644
--- a/monitor.c
+++ b/monitor.c
@@ -25,7 +25,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: monitor.c,v 1.34 2003/03/23 19:02:00 markus Exp $");
+RCSID("$OpenBSD: monitor.c,v 1.36 2003/04/01 10:22:21 markus Exp $");
 
 #include <openssl/dh.h>
 
diff --git a/monitor_wrap.c b/monitor_wrap.c
index 1395a32f4..c9714138a 100644
--- a/monitor_wrap.c
+++ b/monitor_wrap.c
@@ -25,7 +25,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: monitor_wrap.c,v 1.22 2003/02/16 17:30:33 markus Exp $");
+RCSID("$OpenBSD: monitor_wrap.c,v 1.24 2003/04/01 10:22:21 markus Exp $");
 
 #include <openssl/bn.h>
 #include <openssl/dh.h>
diff --git a/openbsd-compat/bsd-cray.h b/openbsd-compat/bsd-cray.h
index 68947c92f..a09954f2f 100644
--- a/openbsd-compat/bsd-cray.h
+++ b/openbsd-compat/bsd-cray.h
@@ -1,5 +1,5 @@
 /* 
- * $Id: bsd-cray.h,v 1.6.2.1 2003/03/21 01:07:45 mouring Exp $
+ * $Id: bsd-cray.h,v 1.7 2003/03/21 01:05:38 mouring Exp $
  *
  * bsd-cray.h
  *
diff --git a/openbsd-compat/bsd-getpeereid.c b/openbsd-compat/bsd-getpeereid.c
index 3f554e72a..bcda2c155 100644
--- a/openbsd-compat/bsd-getpeereid.c
+++ b/openbsd-compat/bsd-getpeereid.c
@@ -24,7 +24,7 @@
 
 #include "includes.h"
 
-RCSID("$Id: bsd-getpeereid.c,v 1.1.4.1 2003/03/26 05:02:47 djm Exp $");
+RCSID("$Id: bsd-getpeereid.c,v 1.2 2003/03/24 22:07:52 djm Exp $");
 
 #if !defined(HAVE_GETPEEREID)
 
diff --git a/openbsd-compat/bsd-snprintf.c b/openbsd-compat/bsd-snprintf.c
index 1c72ea61d..2f82180d1 100644
--- a/openbsd-compat/bsd-snprintf.c
+++ b/openbsd-compat/bsd-snprintf.c
@@ -1,3 +1,10 @@
+/*
+ * Copyright Patrick Powell 1995
+ * This code is based on code written by Patrick Powell (papowell@astart.com)
+ * It may be used for any purpose as long as this notice remains intact
+ * on all source code distributions
+ */
+
 /**************************************************************
  * Original:
  * Patrick Powell Tue Apr 11 09:48:21 PDT 1995
@@ -51,7 +58,7 @@
 
 #include "includes.h"
 
-RCSID("$Id: bsd-snprintf.c,v 1.5 2001/02/25 23:20:41 mouring Exp $");
+RCSID("$Id: bsd-snprintf.c,v 1.6 2003/04/01 11:31:56 djm Exp $");
 
 #if defined(BROKEN_SNPRINTF)            /* For those with broken snprintf() */
 # undef HAVE_SNPRINTF
diff --git a/openbsd-compat/fake-getaddrinfo.c b/openbsd-compat/fake-getaddrinfo.c
index bc58f30a6..e63bda970 100644
--- a/openbsd-compat/fake-getaddrinfo.c
+++ b/openbsd-compat/fake-getaddrinfo.c
@@ -12,7 +12,7 @@
 #include "includes.h"
 #include "ssh.h"
 
-RCSID("$Id: fake-getaddrinfo.c,v 1.4.2.1 2003/03/26 05:03:06 djm Exp $");
+RCSID("$Id: fake-getaddrinfo.c,v 1.5 2003/03/24 02:35:59 djm Exp $");
 
 #ifndef HAVE_GAI_STRERROR
 char *gai_strerror(int ecode)
diff --git a/packet.c b/packet.c
index 17673f920..5866aafbf 100644
--- a/packet.c
+++ b/packet.c
@@ -37,7 +37,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: packet.c,v 1.102 2002/12/10 19:47:14 markus Exp $");
+RCSID("$OpenBSD: packet.c,v 1.104 2003/04/01 10:22:21 markus Exp $");
 
 #include "xmalloc.h"
 #include "buffer.h"
diff --git a/packet.h b/packet.h
index 483472d50..7ff2812fe 100644
--- a/packet.h
+++ b/packet.h
@@ -1,4 +1,4 @@
-/*      $OpenBSD: packet.h,v 1.35 2002/06/19 18:01:00 markus Exp $      */
+/*      $OpenBSD: packet.h,v 1.37 2003/04/01 10:22:21 markus Exp $      */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
diff --git a/readconf.c b/readconf.c
index c2497638f..18f7dae8a 100644
--- a/readconf.c
+++ b/readconf.c
@@ -12,7 +12,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: readconf.c,v 1.102 2003/02/05 09:02:28 markus Exp $");
+RCSID("$OpenBSD: readconf.c,v 1.104 2003/04/01 10:22:21 markus Exp $");
 
 #include "ssh.h"
 #include "xmalloc.h"
diff --git a/readconf.h b/readconf.h
index 7b59878f8..6066d4635 100644
--- a/readconf.h
+++ b/readconf.h
@@ -1,4 +1,4 @@
-/*      $OpenBSD: readconf.h,v 1.44 2002/11/07 22:08:07 markus Exp $    */
+/*      $OpenBSD: readconf.h,v 1.46 2003/04/01 10:22:21 markus Exp $    */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
diff --git a/scp.1 b/scp.1
index 89ebf7089..a3ec2e0c6 100644
--- a/scp.1
+++ b/scp.1
@@ -9,7 +9,7 @@
 .\"
 .\" Created: Sun May  7 00:14:37 1995 ylo
 .\"
-.\" $OpenBSD: scp.1,v 1.26 2003/01/28 17:24:51 stevesk Exp $
+.\" $OpenBSD: scp.1,v 1.27 2003/03/28 10:11:43 jmc Exp $
 .\"
 .Dd September 25, 1999
 .Dt SCP 1
@@ -19,6 +19,7 @@
 .Nd secure copy (remote file copy program)
 .Sh SYNOPSIS
 .Nm scp
+.Bk -words
 .Op Fl pqrvBC1246
 .Op Fl F Ar ssh_config
 .Op Fl S Ar program
@@ -40,6 +41,7 @@
 .Ar host2 No :
 .Oc Ar file2
 .Sm on
+.Ek
 .Sh DESCRIPTION
 .Nm
 copies files between hosts on a network.
diff --git a/serverloop.c b/serverloop.c
index e66d529e9..050081018 100644
--- a/serverloop.c
+++ b/serverloop.c
@@ -35,7 +35,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: serverloop.c,v 1.104 2002/09/19 16:03:15 stevesk Exp $");
+RCSID("$OpenBSD: serverloop.c,v 1.106 2003/04/01 10:22:21 markus Exp $");
 
 #include "xmalloc.h"
 #include "packet.h"
diff --git a/sftp.0 b/sftp.0
index 1680e489c..2ebe4eb54 100644
--- a/sftp.0
+++ b/sftp.0
@@ -39,19 +39,19 @@ SFTP(1)                   BSD General Commands Manual                  SFTP(1)
      ^[[1mM-bMM-^Ro ^[[4m^[[22mssh_option^[[0m
              Can be used to pass options to ^[[1mssh ^[[22min the format used in
              ssh_config(5).  This is useful for specifying options for which
-             there is no separate ^[[1msftp ^[[22mcommandM-bM-^@M-^Pline flag.  For example, to
+             there is no separate ^[[1msftp ^[[22mcommandM-bM-^@M-^Pline flag. For example, to
              specify an alternate port use: ^[[1msftp M-bM-^@M-^PoPort=24^[[22m.
 
      ^[[1mM-bMM-^Rs ^[[4m^[[22msubsystem^[[24m | ^[[4msftp_server^[[0m
              Specifies the SSH2 subsystem or the path for an sftp server on
-             the remote host.  A path is useful for using sftp over protocol
+             the remote host. A path is useful for using sftp over protocol
              version 1, or when the remote ^[[1msshd ^[[22mdoes not have an sftp subsysM-bM-^@M-^P
              tem configured.
 
      ^[[1mM-bMM-^Rv      ^[[22mRaise logging level. This option is also passed to ssh.
 
      ^[[1mM-bMM-^RB ^[[4m^[[22mbuffer_size^[[0m
-             Specify  the size of the buffer that ^[[1msftp ^[[22muses when transferring
+             Specify the size of the buffer that ^[[1msftp ^[[22muses when transferring
              files. Larger buffers require fewer round trips at the cost of
              higher memory consumption. The default is 32768 bytes.
 
diff --git a/sftp.1 b/sftp.1
index ecd4d3174..02d2c274b 100644
--- a/sftp.1
+++ b/sftp.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: sftp.1,v 1.40 2003/01/10 08:19:07 fgsch Exp $
+.\" $OpenBSD: sftp.1,v 1.41 2003/03/28 10:11:43 jmc Exp $
 .\"
 .\" Copyright (c) 2001 Damien Miller.  All rights reserved.
 .\"
@@ -30,6 +30,7 @@
 .Nd Secure file transfer program
 .Sh SYNOPSIS
 .Nm sftp
+.Bk -words
 .Op Fl vC1
 .Op Fl b Ar batchfile
 .Op Fl o Ar ssh_option
@@ -40,10 +41,15 @@
 .Op Fl R Ar num_requests
 .Op Fl S Ar program
 .Ar host
+.Ek
 .Nm sftp
-.Op [\fIuser\fR@]\fIhost\fR[:\fIfile\fR [\fIfile\fR]]
+.Oo Oo Ar user Ns No @ Oc Ns
+.Ar host Ns Oo : Ns Ar file Oo
+.Ar file Oc Oc Oc
 .Nm sftp
-.Op [\fIuser\fR@]\fIhost\fR[:\fIdir\fR[\fI/\fR]]
+.Oo Oo Ar user Ns No @ Oc Ns
+.Ar host Ns Oo : Ns Ar dir Ns
+.Oo Ar / Oc Oc Oc
 .Sh DESCRIPTION
 .Nm
 is an interactive file transfer program, similar to
@@ -77,13 +83,13 @@ non-interactive authentication.
 will abort if any of the following
 commands fail:
 .Ic get , put , rename , ln ,
-.Ic rm , mkdir , chdir , ls , 
+.Ic rm , mkdir , chdir , ls ,
 .Ic lchdir , chmod , chown , chgrp , lpwd
 and
 .Ic lmkdir .
-Termination on error can be suppressed on a command by command basis by 
-prefixing the command with a 
-.Ic '-' 
+Termination on error can be suppressed on a command by command basis by
+prefixing the command with a
+.Ic '-'
 character (For example,
 .Ic -rm /tmp/blah*
 ).
@@ -95,19 +101,19 @@ in the format used in
 This is useful for specifying options
 for which there is no separate
 .Nm sftp
-command-line flag.  For example, to specify an alternate
+command-line flag. For example, to specify an alternate
 port use:
 .Ic sftp -oPort=24 .
 .It Fl s Ar subsystem | sftp_server
 Specifies the SSH2 subsystem or the path for an sftp server
-on the remote host.  A path is useful for using sftp over
+on the remote host. A path is useful for using sftp over
 protocol version 1, or when the remote
 .Nm sshd
 does not have an sftp subsystem configured.
 .It Fl v
 Raise logging level. This option is also passed to ssh.
 .It Fl B Ar buffer_size
-Specify  the size of the buffer that
+Specify the size of the buffer that
 .Nm
 uses when transferring files. Larger buffers require fewer round trips at
 the cost of higher memory consumption. The default is 32768 bytes.
diff --git a/ssh-add.0 b/ssh-add.0
index 0e2d1bca6..f8be19d53 100644
--- a/ssh-add.0
+++ b/ssh-add.0
@@ -43,8 +43,8 @@ SSHM-bM-^@M-^PADD(1)                BSD General Commands Manual               SS
              fied in sshd_config(5).
 
      ^[[1mM-bMM-^Rc      ^[[22mIndicates that added identities should be subject to confirmation
-             before being used for authentication. Confirmation is performed
-             by the SSH_ASKPASS program mentioned below. Successful confirmaM-bM-^@M-^P
+             before being used for authentication.  Confirmation is performed
+             by the SSH_ASKPASS program mentioned below.  Successful confirmaM-bM-^@M-^P
              tion is signaled by a zero exit status from the SSH_ASKPASS proM-bM-^@M-^P
              gram, rather than text entered into the requester.
 
diff --git a/ssh-add.1 b/ssh-add.1
index 25d7333e9..bcdb8e7f6 100644
--- a/ssh-add.1
+++ b/ssh-add.1
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: ssh-add.1,v 1.37 2003/02/10 11:51:47 markus Exp $
+.\"     $OpenBSD: ssh-add.1,v 1.38 2003/03/28 10:11:43 jmc Exp $
 .\"
 .\"  -*- nroff -*-
 .\"
@@ -95,10 +95,11 @@ specified in
 .Xr sshd_config 5 .
 .It Fl c
 Indicates that added identities should be subject to confirmation before
-being used for authentication. Confirmation is performed by the 
+being used for authentication.
+Confirmation is performed by the
 .Ev SSH_ASKPASS
-program mentioned below. Successful confirmation is signaled by a zero
-exit status from the 
+program mentioned below.
+Successful confirmation is signaled by a zero exit status from the
 .Ev SSH_ASKPASS
 program, rather than text entered into the requester.
 .It Fl s Ar reader
diff --git a/ssh-agent.1 b/ssh-agent.1
index 98f9dc80d..fde4608bb 100644
--- a/ssh-agent.1
+++ b/ssh-agent.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ssh-agent.1,v 1.36 2003/01/21 18:14:36 marc Exp $
+.\" $OpenBSD: ssh-agent.1,v 1.37 2003/03/28 10:11:43 jmc Exp $
 .\"
 .\" Author: Tatu Ylonen <ylo@cs.hut.fi>
 .\" Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -88,7 +88,7 @@ Kill the current agent (given by the
 .Ev SSH_AGENT_PID
 environment variable).
 .It Fl t Ar life
-Set a default value for the maximum lifetime of identities added to the agent. 
+Set a default value for the maximum lifetime of identities added to the agent.
 The lifetime may be specified in seconds or in a time format specified in
 .Xr sshd 8 .
 A lifetime specified for an identity with
@@ -96,7 +96,8 @@ A lifetime specified for an identity with
 overrides this value.
 Without this option the default maximum lifetime is forever.
 .It Fl d
-Debug mode.  When this option is specified
+Debug mode.
+When this option is specified
 .Nm
 will not fork.
 .El
diff --git a/ssh-keygen.1 b/ssh-keygen.1
index 78fdb496a..000e8ff2a 100644
--- a/ssh-keygen.1
+++ b/ssh-keygen.1
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: ssh-keygen.1,v 1.55 2002/11/26 02:35:30 stevesk Exp $
+.\"     $OpenBSD: ssh-keygen.1,v 1.56 2003/03/28 10:11:43 jmc Exp $
 .\"
 .\"  -*- nroff -*-
 .\"
@@ -45,12 +45,14 @@
 .Nd authentication key generation, management and conversion
 .Sh SYNOPSIS
 .Nm ssh-keygen
+.Bk -words
 .Op Fl q
 .Op Fl b Ar bits
 .Fl t Ar type
 .Op Fl N Ar new_passphrase
 .Op Fl C Ar comment
 .Op Fl f Ar output_keyfile
+.Ek
 .Nm ssh-keygen
 .Fl p
 .Op Fl P Ar old_passphrase
diff --git a/ssh-keyscan.1 b/ssh-keyscan.1
index 2f33ddf20..f6596c481 100644
--- a/ssh-keyscan.1
+++ b/ssh-keyscan.1
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: ssh-keyscan.1,v 1.14 2002/02/13 08:33:47 mpech Exp $
+.\"     $OpenBSD: ssh-keyscan.1,v 1.15 2003/03/28 10:11:43 jmc Exp $
 .\"
 .\" Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>.
 .\"
@@ -14,6 +14,7 @@
 .Nd gather ssh public keys
 .Sh SYNOPSIS
 .Nm ssh-keyscan
+.Bk -words
 .Op Fl v46
 .Op Fl p Ar port
 .Op Fl T Ar timeout
@@ -21,10 +22,12 @@
 .Op Fl f Ar file
 .Op Ar host | addrlist namelist
 .Op Ar ...
+.Ek
 .Sh DESCRIPTION
 .Nm
 is a utility for gathering the public ssh host keys of a number of
-hosts.  It was designed to aid in building and verifying
+hosts.
+It was designed to aid in building and verifying
 .Pa ssh_known_hosts
 files.
 .Nm
@@ -33,9 +36,11 @@ scripts.
 .Pp
 .Nm
 uses non-blocking socket I/O to contact as many hosts as possible in
-parallel, so it is very efficient.  The keys from a domain of 1,000
+parallel, so it is very efficient.
+The keys from a domain of 1,000
 hosts can be collected in tens of seconds, even when some of those
-hosts are down or do not run ssh.  For scanning, one does not need
+hosts are down or do not run ssh.
+For scanning, one does not need
 login access to the machines that are being scanned, nor does the
 scanning process involve any encryption.
 .Pp
@@ -44,12 +49,13 @@ The options are as follows:
 .It Fl p Ar port
 Port to connect to on the remote host.
 .It Fl T Ar timeout
-Set the timeout for connection attempts.  If
+Set the timeout for connection attempts.
+If
 .Pa timeout
 seconds have elapsed since a connection was initiated to a host or since the
 last time anything was read from that host, then the connection is
-closed and the host in question considered unavailable.  Default is 5
-seconds.
+closed and the host in question considered unavailable.
+Default is 5 seconds.
 .It Fl t Ar type
 Specifies the type of the key to fetch from the scanned hosts.
 The possible values are
diff --git a/ssh-keysign.8 b/ssh-keysign.8
index 99d373406..2e3f8ff3e 100644
--- a/ssh-keysign.8
+++ b/ssh-keysign.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ssh-keysign.8,v 1.5 2002/11/24 21:46:24 stevesk Exp $
+.\" $OpenBSD: ssh-keysign.8,v 1.6 2003/03/28 10:11:43 jmc Exp $
 .\"
 .\" Copyright (c) 2002 Markus Friedl.  All rights reserved.
 .\"
@@ -62,8 +62,8 @@ Controls whether
 is enabled.
 .It Pa /etc/ssh/ssh_host_dsa_key, /etc/ssh/ssh_host_rsa_key
 These files contain the private parts of the host keys used to
-generate the digital signature.  They
-should be owned by root, readable only by root, and not
+generate the digital signature.
+They should be owned by root, readable only by root, and not
 accessible to others.
 Since they are readable only by root,
 .Nm
diff --git a/ssh.0 b/ssh.0
index 8fcd2a3d0..7bf7d6210 100644
--- a/ssh.0
+++ b/ssh.0
@@ -8,8 +8,8 @@ SSH(1)                    BSD General Commands Manual                   SSH(1)
 
      ^[[1mssh ^[[22m[^[[1mM-bMM-^RafgknqstvxACNTX1246^[[22m] [^[[1mM-bMM-^Rb ^[[4m^[[22mbind_address^[[24m] [^[[1mM-bMM-^Rc ^[[4m^[[22mcipher_spec^[[24m]
          [^[[1mM-bMM-^Re ^[[4m^[[22mescape_char^[[24m] [^[[1mM-bMM-^Ri ^[[4m^[[22midentity_file^[[24m] [^[[1mM-bMM-^Rl ^[[4m^[[22mlogin_name^[[24m] [^[[1mM-bMM-^Rm ^[[4m^[[22mmac_spec^[[24m]
-         [^[[1mM-bMM-^Ro ^[[4m^[[22moption^[[24m] [^[[1mM-bMM-^Rp ^[[4m^[[22mport^[[24m] [^[[1mM-bMM-^RF ^[[4m^[[22mconfigfile^[[24m] [^[[1mM-bMM-^RL ^[[4m^[[22mport^[[24m:^[[4mhost^[[24m:^[[4mhostport^[[24m] [^[[1mM-bMM-^RR^[[0m
-         ^[[4mport^[[24m:^[[4mhost^[[24m:^[[4mhostport^[[24m] [^[[1mM-bMM-^RD ^[[4m^[[22mport^[[24m] ^[[4mhostname^[[24m | ^[[4muser@hostname^[[24m [^[[4mcommand^[[24m]
+         [^[[1mM-bMM-^Ro ^[[4m^[[22moption^[[24m] [^[[1mM-bMM-^Rp ^[[4m^[[22mport^[[24m] [^[[1mM-bMM-^RF ^[[4m^[[22mconfigfile^[[24m] [^[[1mM-bMM-^RL ^[[4m^[[22mport^[[24m:^[[4mhost^[[24m:^[[4mhostport^[[24m]
+         [^[[1mM-bMM-^RR ^[[4m^[[22mport^[[24m:^[[4mhost^[[24m:^[[4mhostport^[[24m] [^[[1mM-bMM-^RD ^[[4m^[[22mport^[[24m] ^[[4mhostname^[[24m | ^[[4muser@hostname^[[24m [^[[4mcommand^[[24m]
 
 ^[[1mDESCRIPTION^[[0m
      ^[[1mssh ^[[22m(SSH client) is a program for logging into a remote machine and for
diff --git a/ssh.1 b/ssh.1
index ed2cbecb5..86c1f0bb1 100644
--- a/ssh.1
+++ b/ssh.1
@@ -34,7 +34,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $OpenBSD: ssh.1,v 1.167 2002/09/27 15:46:21 stevesk Exp $
+.\" $OpenBSD: ssh.1,v 1.168 2003/03/28 10:11:43 jmc Exp $
 .Dd September 25, 1999
 .Dt SSH 1
 .Os
@@ -48,6 +48,7 @@
 .Op Ar command
 .Pp
 .Nm ssh
+.Bk -words
 .Op Fl afgknqstvxACNTX1246
 .Op Fl b Ar bind_address
 .Op Fl c Ar cipher_spec
@@ -66,6 +67,8 @@
 .Sm on
 .Xc
 .Oc
+.Ek
+.Bk -words
 .Oo Fl R Xo
 .Sm off
 .Ar port :
@@ -77,6 +80,7 @@
 .Op Fl D Ar port
 .Ar hostname | user@hostname
 .Op Ar command
+.Ek
 .Sh DESCRIPTION
 .Nm
 (SSH client) is a program for logging into a remote machine and for
@@ -361,7 +365,7 @@ variable is set to
 .Fl A
 and
 .Fl a
-options described later) and 
+options described later) and
 the user is using an authentication agent, the connection to the agent
 is automatically forwarded to the remote side.
 .Pp
@@ -403,10 +407,11 @@ Disables forwarding of the authentication agent connection.
 Enables forwarding of the authentication agent connection.
 This can also be specified on a per-host basis in a configuration file.
 .Pp
-Agent forwarding should be enabled with caution.  Users with the
-ability to bypass file permissions on the remote host (for the agent's
-Unix-domain socket) can access the local agent through the forwarded
-connection.  An attacker cannot obtain key material from the agent,
+Agent forwarding should be enabled with caution.
+Users with the ability to bypass file permissions on the remote host
+(for the agent's Unix-domain socket)
+can access the local agent through the forwarded connection.
+An attacker cannot obtain key material from the agent,
 however they can perform operations on the keys that enable them to
 authenticate using the identities loaded into the agent.
 .It Fl b Ar bind_address
@@ -428,8 +433,8 @@ is only supported in the
 client for interoperability with legacy protocol 1 implementations
 that do not support the
 .Ar 3des
-cipher.  Its use is strongly discouraged due to cryptographic
-weaknesses.
+cipher.
+Its use is strongly discouraged due to cryptographic weaknesses.
 .It Fl c Ar cipher_spec
 Additionally, for protocol version 2 a comma-separated list of ciphers can
 be specified in order of preference.
@@ -570,11 +575,11 @@ Disables X11 forwarding.
 Enables X11 forwarding.
 This can also be specified on a per-host basis in a configuration file.
 .Pp
-X11 forwarding should be enabled with caution.  Users with the ability
-to bypass file permissions on the remote host (for the user's X
-authorization database) can access the local X11 display through the
-forwarded connection.  An attacker may then be able to perform
-activities such as keystroke monitoring.
+X11 forwarding should be enabled with caution.
+Users with the ability to bypass file permissions on the remote host
+(for the user's X authorization database)
+can access the local X11 display through the forwarded connection.
+An attacker may then be able to perform activities such as keystroke monitoring.
 .It Fl C
 Requests compression of all data (including stdin, stdout, stderr, and
 data for forwarded X11 and TCP/IP connections).
@@ -641,7 +646,8 @@ This works by allocating a socket to listen to
 on the local side, and whenever a connection is made to this port, the
 connection is forwarded over the secure channel, and the application
 protocol is then used to determine where to connect to from the
-remote machine.  Currently the SOCKS4 protocol is supported, and
+remote machine.
+Currently the SOCKS4 protocol is supported, and
 .Nm
 will act as a SOCKS4 server.
 Only root can forward privileged ports.
diff --git a/ssh_config.5 b/ssh_config.5
index 20bba1502..15b36f273 100644
--- a/ssh_config.5
+++ b/ssh_config.5
@@ -34,7 +34,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $OpenBSD: ssh_config.5,v 1.6 2003/02/06 09:27:29 markus Exp $
+.\" $OpenBSD: ssh_config.5,v 1.7 2003/03/28 10:11:43 jmc Exp $
 .Dd September 25, 1999
 .Dt SSH_CONFIG 5
 .Os
@@ -183,8 +183,8 @@ is only supported in the
 client for interoperability with legacy protocol 1 implementations
 that do not support the
 .Ar 3des
-cipher.  Its use is strongly discouraged due to cryptographic
-weaknesses.
+cipher.
+Its use is strongly discouraged due to cryptographic weaknesses.
 The default is
 .Dq 3des .
 .It Cm Ciphers
@@ -200,7 +200,8 @@ The default is
 .It Cm ClearAllForwardings
 Specifies that all local, remote and dynamic port forwardings
 specified in the configuration files or on the command line be
-cleared.  This option is primarily useful when used from the
+cleared.
+This option is primarily useful when used from the
 .Nm ssh
 command line to clear port forwardings set in
 configuration files, and is automatically set by
@@ -237,13 +238,14 @@ The default is 1.
 Specifies that a TCP/IP port on the local machine be forwarded
 over the secure channel, and the application
 protocol is then used to determine where to connect to from the
-remote machine.  The argument must be a port number.
+remote machine.
+The argument must be a port number.
 Currently the SOCKS4 protocol is supported, and
 .Nm ssh
 will act as a SOCKS4 server.
 Multiple forwardings may be specified, and
-additional forwardings can be given on the command line.  Only
-the superuser can forward privileged ports.
+additional forwardings can be given on the command line.
+Only the superuser can forward privileged ports.
 .It Cm EscapeChar
 Sets the escape character (default:
 .Ql ~ ) .
@@ -266,10 +268,11 @@ or
 The default is
 .Dq no .
 .Pp
-Agent forwarding should be enabled with caution.  Users with the
-ability to bypass file permissions on the remote host (for the agent's
-Unix-domain socket) can access the local agent through the forwarded
-connection.  An attacker cannot obtain key material from the agent,
+Agent forwarding should be enabled with caution.
+Users with the ability to bypass file permissions on the remote host
+(for the agent's Unix-domain socket)
+can access the local agent through the forwarded connection.
+An attacker cannot obtain key material from the agent,
 however they can perform operations on the keys that enable them to
 authenticate using the identities loaded into the agent.
 .It Cm ForwardX11
@@ -284,18 +287,18 @@ or
 The default is
 .Dq no .
 .Pp
-X11 forwarding should be enabled with caution.  Users with the ability
-to bypass file permissions on the remote host (for the user's X
-authorization database) can access the local X11 display through the
-forwarded connection.  An attacker may then be able to perform
-activities such as keystroke monitoring.
+X11 forwarding should be enabled with caution.
+Users with the ability to bypass file permissions on the remote host
+(for the user's X authorization database)
+can access the local X11 display through the forwarded connection.
+An attacker may then be able to perform activities such as keystroke monitoring.
 .It Cm GatewayPorts
 Specifies whether remote hosts are allowed to connect to local
 forwarded ports.
 By default,
 .Nm ssh
-binds local port forwardings to the loopback address.  This
-prevents other remote hosts from connecting to forwarded ports.
+binds local port forwardings to the loopback address.
+This prevents other remote hosts from connecting to forwarded ports.
 .Cm GatewayPorts
 can be used to specify that
 .Nm ssh
@@ -407,8 +410,9 @@ Gives the verbosity level that is used when logging messages from
 .Nm ssh .
 The possible values are:
 QUIET, FATAL, ERROR, INFO, VERBOSE, DEBUG, DEBUG1, DEBUG2 and DEBUG3.
-The default is INFO.  DEBUG and DEBUG1 are equivalent.  DEBUG2
-and DEBUG3 each specify higher levels of verbose output.
+The default is INFO.
+DEBUG and DEBUG1 are equivalent.
+DEBUG2 and DEBUG3 each specify higher levels of verbose output.
 .It Cm MACs
 Specifies the MAC (message authentication code) algorithms
 in order of preference.
@@ -493,8 +497,8 @@ somewhere.
 Host key management will be done using the
 HostName of the host being connected (defaulting to the name typed by
 the user).
-Setting the command to                                                             
-.Dq none                                                                       
+Setting the command to
+.Dq none
 disables this option entirely.
 Note that
 .Cm CheckHostIP
diff --git a/sshconnect2.c b/sshconnect2.c
index 1f92f0296..642b34b9e 100644
--- a/sshconnect2.c
+++ b/sshconnect2.c
@@ -23,7 +23,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: sshconnect2.c,v 1.112 2003/03/05 22:33:43 markus Exp $");
+RCSID("$OpenBSD: sshconnect2.c,v 1.114 2003/04/01 10:22:21 markus Exp $");
 
 #include "ssh.h"
 #include "ssh2.h"
diff --git a/sshd_config.5 b/sshd_config.5
index 23ac0e96d..6f38a260a 100644
--- a/sshd_config.5
+++ b/sshd_config.5
@@ -34,7 +34,7 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $OpenBSD: sshd_config.5,v 1.14 2003/01/23 08:58:47 jmc Exp $
+.\" $OpenBSD: sshd_config.5,v 1.15 2003/03/28 10:11:43 jmc Exp $
 .Dd September 25, 1999
 .Dt SSHD_CONFIG 5
 .Os
@@ -211,8 +211,8 @@ Specifies whether remote hosts are allowed to connect to ports
 forwarded for the client.
 By default,
 .Nm sshd
-binds remote port forwardings to the loopback address.  This
-prevents other remote hosts from connecting to forwarded ports.
+binds remote port forwardings to the loopback address.
+This prevents other remote hosts from connecting to forwarded ports.
 .Cm GatewayPorts
 can be used to specify that
 .Nm sshd
@@ -370,7 +370,8 @@ is not specified,
 will listen on the address and all prior
 .Cm Port
 options specified. The default is to listen on all local
-addresses.  Multiple
+addresses.
+Multiple
 .Cm ListenAddress
 options are permitted. Additionally, any
 .Cm Port
@@ -385,10 +386,10 @@ Gives the verbosity level that is used when logging messages from
 .Nm sshd .
 The possible values are:
 QUIET, FATAL, ERROR, INFO, VERBOSE, DEBUG, DEBUG1, DEBUG2 and DEBUG3.
-The default is INFO.  DEBUG and DEBUG1 are equivalent.  DEBUG2
-and DEBUG3 each specify higher levels of debugging output.
-Logging with a DEBUG level violates the privacy of users
-and is not recommended.
+The default is INFO.
+DEBUG and DEBUG1 are equivalent.
+DEBUG2 and DEBUG3 each specify higher levels of debugging output.
+Logging with a DEBUG level violates the privacy of users and is not recommended.
 .It Cm MACs
 Specifies the available MAC (message authentication code) algorithms.
 The MAC algorithm is used in protocol version 2
@@ -599,16 +600,18 @@ will be disabled because
 .Xr login 1
 does not know how to handle
 .Xr xauth 1
-cookies.  If
+cookies.
+If
 .Cm UsePrivilegeSeparation
 is specified, it will be disabled after authentication.
 .It Cm UsePrivilegeSeparation
 Specifies whether
 .Nm sshd
 separates privileges by creating an unprivileged child process
-to deal with incoming network traffic.  After successful authentication,
-another process will be created that has the privilege of the authenticated
-user.  The goal of privilege separation is to prevent privilege
+to deal with incoming network traffic.
+After successful authentication, another process will be created that has
+the privilege of the authenticated user.
+The goal of privilege separation is to prevent privilege
 escalation by containing any corruption within the unprivileged processes.
 The default is
 .Dq yes .
@@ -666,7 +669,8 @@ is enabled.
 Specifies whether
 .Nm sshd
 should bind the X11 forwarding server to the loopback address or to
-the wildcard address.  By default,
+the wildcard address.
+By default,
 .Nm sshd
 binds the forwarding server to the loopback address and sets the
 hostname part of the
diff --git a/version.h b/version.h
index 380e35907..75a2b2554 100644
--- a/version.h
+++ b/version.h
@@ -1,3 +1,3 @@
-/* $OpenBSD: version.h,v 1.36 2003/03/17 11:43:47 markus Exp $ */
-  
-#define SSH_VERSION     "OpenSSH_3.6p1"
+/* $OpenBSD: version.h,v 1.37 2003/04/01 10:56:46 markus Exp $ */
+
+#define SSH_VERSION    "OpenSSH_3.6.1p1"