diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | sshd_config.5 | 7 |
2 files changed, 10 insertions, 2 deletions
@@ -27,6 +27,9 @@ | |||
27 | [ssh-keyscan.c] | 27 | [ssh-keyscan.c] |
28 | explicitly initialise remote_major and remote_minor. | 28 | explicitly initialise remote_major and remote_minor. |
29 | from cjwatson AT debian.org; ok markus@ | 29 | from cjwatson AT debian.org; ok markus@ |
30 | - dtucker@cvs.openbsd.org 2004/03/08 10:18:57 | ||
31 | [sshd_config.5] | ||
32 | Document KerberosGetAFSToken; ok markus@ | ||
30 | 33 | ||
31 | 20040307 | 34 | 20040307 |
32 | - (tim) [regress/login-timeout.sh] fix building outside of source tree. | 35 | - (tim) [regress/login-timeout.sh] fix building outside of source tree. |
@@ -887,4 +890,4 @@ | |||
887 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 890 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
888 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 891 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
889 | 892 | ||
890 | $Id: ChangeLog,v 1.3284 2004/03/08 12:13:00 djm Exp $ | 893 | $Id: ChangeLog,v 1.3285 2004/03/08 12:13:15 djm Exp $ |
diff --git a/sshd_config.5 b/sshd_config.5 index 41228248c..a8c865775 100644 --- a/sshd_config.5 +++ b/sshd_config.5 | |||
@@ -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_config.5,v 1.28 2004/02/17 19:35:21 jmc Exp $ | 37 | .\" $OpenBSD: sshd_config.5,v 1.29 2004/03/08 10:18:57 dtucker Exp $ |
38 | .Dd September 25, 1999 | 38 | .Dd September 25, 1999 |
39 | .Dt SSHD_CONFIG 5 | 39 | .Dt SSHD_CONFIG 5 |
40 | .Os | 40 | .Os |
@@ -300,6 +300,11 @@ To use this option, the server needs a | |||
300 | Kerberos servtab which allows the verification of the KDC's identity. | 300 | Kerberos servtab which allows the verification of the KDC's identity. |
301 | Default is | 301 | Default is |
302 | .Dq no . | 302 | .Dq no . |
303 | .It Cm KerberosGetAFSToken | ||
304 | If AFS is active and the user has a Kerberos 5 TGT, attempt to aquire | ||
305 | an AFS token before accessing the user's home directory. | ||
306 | Default is | ||
307 | .Dq no . | ||
303 | .It Cm KerberosOrLocalPasswd | 308 | .It Cm KerberosOrLocalPasswd |
304 | If set then if password authentication through Kerberos fails then | 309 | If set then if password authentication through Kerberos fails then |
305 | the password will be validated via any additional local mechanism | 310 | the password will be validated via any additional local mechanism |