diff options
author | Ben Lindstrom <mouring@eviladmin.org> | 2001-02-10 22:19:23 +0000 |
---|---|---|
committer | Ben Lindstrom <mouring@eviladmin.org> | 2001-02-10 22:19:23 +0000 |
commit | a1ebd89d243fb079b6c3b89e14dd6af47ef11161 (patch) | |
tree | d918f44384959b63c29d0c2569e8ce1f6ca8b8a7 | |
parent | 03df5bde9c6ae82168098b9be5775b42d02ad8e5 (diff) |
Sync w/ OpenBSD
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | sshd.8 | 7 |
2 files changed, 5 insertions, 7 deletions
@@ -43,9 +43,8 @@ | |||
43 | - markus@cvs.openbsd.org 2001/02/10 12:09:21 | 43 | - markus@cvs.openbsd.org 2001/02/10 12:09:21 |
44 | [sshconnect2.c] | 44 | [sshconnect2.c] |
45 | remove some lines | 45 | remove some lines |
46 | - (bal) Minor correction to sftp-client.c I made. Should return 'status' | ||
47 | instead of '0' (from the OpenBSD tree) | 46 | instead of '0' (from the OpenBSD tree) |
48 | - (bal) Synced ssh.1 w/ OpenBSD | 47 | - (bal) Synced ssh.1 and sshd.8 w/ OpenBSD |
49 | 48 | ||
50 | 20010210 | 49 | 20010210 |
51 | - (djm) Sync sftp and scp stuff from OpenBSD: | 50 | - (djm) Sync sftp and scp stuff from OpenBSD: |
@@ -3829,4 +3828,4 @@ | |||
3829 | - Wrote replacements for strlcpy and mkdtemp | 3828 | - Wrote replacements for strlcpy and mkdtemp |
3830 | - Released 1.0pre1 | 3829 | - Released 1.0pre1 |
3831 | 3830 | ||
3832 | $Id: ChangeLog,v 1.723 2001/02/10 22:16:41 mouring Exp $ | 3831 | $Id: ChangeLog,v 1.724 2001/02/10 22:19:23 mouring 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: sshd.8,v 1.90 2001/02/04 11:11:55 djm Exp $ | 37 | .\" $OpenBSD: sshd.8,v 1.92 2001/02/09 23:38:11 deraadt Exp $ |
38 | .Dd September 25, 1999 | 38 | .Dd September 25, 1999 |
39 | .Dt SSHD 8 | 39 | .Dt SSHD 8 |
40 | .Os | 40 | .Os |
@@ -298,7 +298,7 @@ Specifies whether an AFS token may be forwarded to the server. | |||
298 | Default is | 298 | Default is |
299 | .Dq yes . | 299 | .Dq yes . |
300 | .It Cm AllowGroups | 300 | .It Cm AllowGroups |
301 | This keyword can be followed by a number of group names, separated | 301 | This keyword can be followed by a list of group names, separated |
302 | by spaces. | 302 | by spaces. |
303 | If specified, login is allowed only for users whose primary | 303 | If specified, login is allowed only for users whose primary |
304 | group or supplementary group list matches one of the patterns. | 304 | group or supplementary group list matches one of the patterns. |
@@ -319,7 +319,7 @@ users are also denied shell access, as they can always install their | |||
319 | own forwarders. | 319 | own forwarders. |
320 | .Pp | 320 | .Pp |
321 | .It Cm AllowUsers | 321 | .It Cm AllowUsers |
322 | This keyword can be followed by a number of user names, separated | 322 | This keyword can be followed by a list of user names, separated |
323 | by spaces. | 323 | by spaces. |
324 | If specified, login is allowed only for users names that | 324 | If specified, login is allowed only for users names that |
325 | match one of the patterns. | 325 | match one of the patterns. |
@@ -1093,6 +1093,5 @@ protocol versions 1.5 and 2.0. | |||
1093 | .Xr ssh-add 1 , | 1093 | .Xr ssh-add 1 , |
1094 | .Xr ssh-agent 1 , | 1094 | .Xr ssh-agent 1 , |
1095 | .Xr ssh-keygen 1 , | 1095 | .Xr ssh-keygen 1 , |
1096 | .Xr ssl 8 , | ||
1097 | .Xr rlogin 1 , | 1096 | .Xr rlogin 1 , |
1098 | .Xr rsh 1 | 1097 | .Xr rsh 1 |