Sync w/ OpenBSD

This commit is contained in:
Ben Lindstrom 2001-02-10 22:19:23 +00:00
parent 03df5bde9c
commit a1ebd89d24
2 changed files with 5 additions and 7 deletions

View File

@ -43,9 +43,8 @@
- markus@cvs.openbsd.org 2001/02/10 12:09:21
[sshconnect2.c]
remove some lines
- (bal) Minor correction to sftp-client.c I made. Should return 'status'
instead of '0' (from the OpenBSD tree)
- (bal) Synced ssh.1 w/ OpenBSD
- (bal) Synced ssh.1 and sshd.8 w/ OpenBSD
20010210
- (djm) Sync sftp and scp stuff from OpenBSD:
@ -3829,4 +3828,4 @@
- Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1
$Id: ChangeLog,v 1.723 2001/02/10 22:16:41 mouring Exp $
$Id: ChangeLog,v 1.724 2001/02/10 22:19:23 mouring Exp $

7
sshd.8
View File

@ -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.8,v 1.90 2001/02/04 11:11:55 djm Exp $
.\" $OpenBSD: sshd.8,v 1.92 2001/02/09 23:38:11 deraadt Exp $
.Dd September 25, 1999
.Dt SSHD 8
.Os
@ -298,7 +298,7 @@ Specifies whether an AFS token may be forwarded to the server.
Default is
.Dq yes .
.It Cm AllowGroups
This keyword can be followed by a number of group names, separated
This keyword can be followed by a list of group names, separated
by spaces.
If specified, login is allowed only for users whose primary
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
own forwarders.
.Pp
.It Cm AllowUsers
This keyword can be followed by a number of user names, separated
This keyword can be followed by a list of user names, separated
by spaces.
If specified, login is allowed only for users names that
match one of the patterns.
@ -1093,6 +1093,5 @@ protocol versions 1.5 and 2.0.
.Xr ssh-add 1 ,
.Xr ssh-agent 1 ,
.Xr ssh-keygen 1 ,
.Xr ssl 8 ,
.Xr rlogin 1 ,
.Xr rsh 1