diff options
author | Colin Watson <cjwatson@debian.org> | 2010-08-23 23:52:36 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2010-08-23 23:52:36 +0100 |
commit | 78799892cb1858927be02be9737c594052e3f910 (patch) | |
tree | ac3dc2e848ab9dc62fe4252e01e52c3d456f628f /auth.h | |
parent | 3875951bb76a9ec62634ae4026c9cc885d933477 (diff) | |
parent | 31e30b835fd9695d3b6647cab4867001b092e28f (diff) |
* New upstream release (http://www.openssh.com/txt/release-5.6):
- Added a ControlPersist option to ssh_config(5) that automatically
starts a background ssh(1) multiplex master when connecting. This
connection can stay alive indefinitely, or can be set to automatically
close after a user-specified duration of inactivity (closes: #335697,
#350898, #454787, #500573, #550262).
- Support AuthorizedKeysFile, AuthorizedPrincipalsFile,
HostbasedUsesNameFromPacketOnly, and PermitTunnel in sshd_config(5)
Match blocks (closes: #549858).
- sftp(1): fix ls in working directories that contain globbing
characters in their pathnames (LP: #530714).
Diffstat (limited to 'auth.h')
-rw-r--r-- | auth.h | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: auth.h,v 1.65 2010/03/04 10:36:03 djm Exp $ */ | 1 | /* $OpenBSD: auth.h,v 1.66 2010/05/07 11:30:29 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 4 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
@@ -171,8 +171,10 @@ void abandon_challenge_response(Authctxt *); | |||
171 | 171 | ||
172 | char *authorized_keys_file(struct passwd *); | 172 | char *authorized_keys_file(struct passwd *); |
173 | char *authorized_keys_file2(struct passwd *); | 173 | char *authorized_keys_file2(struct passwd *); |
174 | char *authorized_principals_file(struct passwd *); | ||
174 | 175 | ||
175 | FILE *auth_openkeyfile(const char *, struct passwd *, int); | 176 | FILE *auth_openkeyfile(const char *, struct passwd *, int); |
177 | FILE *auth_openprincipals(const char *, struct passwd *, int); | ||
176 | int auth_key_is_revoked(Key *, int); | 178 | int auth_key_is_revoked(Key *, int); |
177 | 179 | ||
178 | HostStatus | 180 | HostStatus |