tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-31 01:35:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

- jmc@cvs.openbsd.org 2011/05/23 07:10:21

Browse Source 
[sshd.8 sshd_config.5]
     tweak previous; ok djm
This commit is contained in:
Damien Miller 2011-05-29 21:41:40 +10:00
parent 201f425d29
commit b9132fc427
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -16,6 +16,9 @@
- djm@cvs.openbsd.org 2011/05/23 03:52:55 - djm@cvs.openbsd.org 2011/05/23 03:52:55
[sshconnect.c] [sshconnect.c]
remove extra newline remove extra newline
- jmc@cvs.openbsd.org 2011/05/23 07:10:21
[sshd.8 sshd_config.5]
tweak previous; ok djm
20110520 20110520
- (djm) [session.c] call setexeccon() before executing passwd for pw - (djm) [session.c] call setexeccon() before executing passwd for pw

6
sshd.8
View File

@ -33,7 +33,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\" .\"
.\" $OpenBSD: sshd.8,v 1.261 2011/05/23 03:30:07 djm Exp $ .\" $OpenBSD: sshd.8,v 1.262 2011/05/23 07:10:21 jmc Exp $
.Dd $Mdocdate: May 23 2011 $ .Dd $Mdocdate: May 23 2011 $
.Dt SSHD 8 .Dt SSHD 8
.Os .Os
@ -462,9 +462,9 @@ is run, and if that
does not exist either, xauth is used to add the cookie. does not exist either, xauth is used to add the cookie.
.Sh AUTHORIZED_KEYS FILE FORMAT .Sh AUTHORIZED_KEYS FILE FORMAT
.Cm AuthorizedKeysFile .Cm AuthorizedKeysFile
specifies the file or files containing public keys for specifies the files containing public keys for
public key authentication; public key authentication;
if none is specified, the default is both if none is specified, the default is
.Pa ~/.ssh/authorized_keys .Pa ~/.ssh/authorized_keys
and and
.Pa ~/.ssh/authorized_keys2 . .Pa ~/.ssh/authorized_keys2 .

10
sshd_config.5
View File

@ -33,7 +33,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\" .\"
.\" $OpenBSD: sshd_config.5,v 1.132 2011/05/23 03:30:07 djm Exp $ .\" $OpenBSD: sshd_config.5,v 1.133 2011/05/23 07:10:21 jmc Exp $
.Dd $Mdocdate: May 23 2011 $ .Dd $Mdocdate: May 23 2011 $
.Dt SSHD_CONFIG 5 .Dt SSHD_CONFIG 5
.Os .Os
@ -168,11 +168,9 @@ After expansion,
.Cm AuthorizedKeysFile .Cm AuthorizedKeysFile
is taken to be an absolute path or one relative to the user's home is taken to be an absolute path or one relative to the user's home
directory. directory.
The default is both Multiple files may be listed, separated by whitespace.
.Dq .ssh/authorized_keys The default is
and .Dq .ssh/authorized_keys .ssh/authorized_keys2 .
.Dq .ssh/authorized_keys2 .
Multiple files may be listed separated by whitespace.
.It Cm AuthorizedPrincipalsFile .It Cm AuthorizedPrincipalsFile
Specifies a file that lists principal names that are accepted for Specifies a file that lists principal names that are accepted for
certificate authentication. certificate authentication.