diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ssh.1 | 8 |
2 files changed, 8 insertions, 5 deletions
@@ -4,6 +4,9 @@ | |||
4 | [ssh.1] | 4 | [ssh.1] |
5 | - typo fix | 5 | - typo fix |
6 | ok jmc@ | 6 | ok jmc@ |
7 | - jmc@cvs.openbsd.org 2006/02/06 21:44:47 | ||
8 | [ssh.1] | ||
9 | make this a little less ambiguous... | ||
7 | 10 | ||
8 | 20060313 | 11 | 20060313 |
9 | - (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong) | 12 | - (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong) |
@@ -3905,4 +3908,4 @@ | |||
3905 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 3908 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
3906 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 3909 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
3907 | 3910 | ||
3908 | $Id: ChangeLog,v 1.4140 2006/03/15 00:05:35 djm Exp $ | 3911 | $Id: ChangeLog,v 1.4141 2006/03/15 00:05:59 djm Exp $ |
@@ -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.1,v 1.254 2006/02/06 15:54:07 msf Exp $ | 37 | .\" $OpenBSD: ssh.1,v 1.255 2006/02/06 21:44:47 jmc Exp $ |
38 | .Dd September 25, 1999 | 38 | .Dd September 25, 1999 |
39 | .Dt SSH 1 | 39 | .Dt SSH 1 |
40 | .Os | 40 | .Os |
@@ -1075,11 +1075,11 @@ Client access may be more finely tuned via the | |||
1075 | file (see below) and the | 1075 | file (see below) and the |
1076 | .Cm PermitRootLogin | 1076 | .Cm PermitRootLogin |
1077 | server option. | 1077 | server option. |
1078 | The following entry would permit connections on the first | 1078 | The following entry would permit connections on |
1079 | .Xr tun 4 | 1079 | .Xr tun 4 |
1080 | device from user | 1080 | device 1 from user |
1081 | .Dq jane | 1081 | .Dq jane |
1082 | and on the second device from user | 1082 | and on tun device 2 from user |
1083 | .Dq john , | 1083 | .Dq john , |
1084 | if | 1084 | if |
1085 | .Cm PermitRootLogin | 1085 | .Cm PermitRootLogin |