summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2002-04-23 20:51:15 +1000
committerDamien Miller <djm@mindrot.org>2002-04-23 20:51:15 +1000
commit7a8558d3ea81935888149c89ea9b4ee69ab8d458 (patch)
tree8ec77416c4d6f4932176a02042772bae1d7b1aa9
parentbad0e0162fb3e943498d66406784baee9de0ebcc (diff)
- stevesk@cvs.openbsd.org 2002/04/21 16:19:27
[sshd.8 sshd_config] document default AFSTokenPassing no; ok deraadt@
-rw-r--r--ChangeLog5
-rw-r--r--sshd.84
-rw-r--r--sshd_config5
3 files changed, 8 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 06cc0c2ff..86276bd6e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,9 @@
12 - markus@cvs.openbsd.org 2002/04/20 09:17:19 12 - markus@cvs.openbsd.org 2002/04/20 09:17:19
13 [radix.c] 13 [radix.c]
14 rewrite using the buffer_* API, fixes overflow; ok deraadt@ 14 rewrite using the buffer_* API, fixes overflow; ok deraadt@
15 - stevesk@cvs.openbsd.org 2002/04/21 16:19:27
16 [sshd.8 sshd_config]
17 document default AFSTokenPassing no; ok deraadt@
15 18
1620020421 1920020421
17 - (tim) [entropy.c.] Portability fix for SCO Unix 3.2v4.x (SCO OSR 3.0). 20 - (tim) [entropy.c.] Portability fix for SCO Unix 3.2v4.x (SCO OSR 3.0).
@@ -8278,4 +8281,4 @@
8278 - Wrote replacements for strlcpy and mkdtemp 8281 - Wrote replacements for strlcpy and mkdtemp
8279 - Released 1.0pre1 8282 - Released 1.0pre1
8280 8283
8281$Id: ChangeLog,v 1.2065 2002/04/23 10:46:56 djm Exp $ 8284$Id: ChangeLog,v 1.2066 2002/04/23 10:51:15 djm Exp $
diff --git a/sshd.8 b/sshd.8
index 63ca7df22..59ba65f9c 100644
--- a/sshd.8
+++ b/sshd.8
@@ -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.176 2002/04/05 20:56:21 stevesk Exp $ 37.\" $OpenBSD: sshd.8,v 1.177 2002/04/21 16:19:27 stevesk Exp $
38.Dd September 25, 1999 38.Dd September 25, 1999
39.Dt SSHD 8 39.Dt SSHD 8
40.Os 40.Os
@@ -332,7 +332,7 @@ keywords are case-insensitive and arguments are case-sensitive):
332.It Cm AFSTokenPassing 332.It Cm AFSTokenPassing
333Specifies whether an AFS token may be forwarded to the server. 333Specifies whether an AFS token may be forwarded to the server.
334Default is 334Default is
335.Dq yes . 335.Dq no .
336.It Cm AllowGroups 336.It Cm AllowGroups
337This keyword can be followed by a list of group name patterns, separated 337This keyword can be followed by a list of group name patterns, separated
338by spaces. 338by spaces.
diff --git a/sshd_config b/sshd_config
index a3d8e9a63..a6b148bc9 100644
--- a/sshd_config
+++ b/sshd_config
@@ -1,4 +1,4 @@
1# $OpenBSD: sshd_config,v 1.49 2002/03/21 20:51:12 markus Exp $ 1# $OpenBSD: sshd_config,v 1.50 2002/04/21 16:19:27 stevesk Exp $
2 2
3# This is the sshd server system-wide configuration file. See sshd(8) 3# This is the sshd server system-wide configuration file. See sshd(8)
4# for more information. 4# for more information.
@@ -65,8 +65,7 @@
65#KerberosOrLocalPasswd yes 65#KerberosOrLocalPasswd yes
66#KerberosTicketCleanup yes 66#KerberosTicketCleanup yes
67 67
68# AFSTokenPassing automatically enabled if k_hasafs() is true 68#AFSTokenPassing no
69#AFSTokenPassing yes
70 69
71# Kerberos TGT Passing only works with the AFS kaserver 70# Kerberos TGT Passing only works with the AFS kaserver
72#KerberosTgtPassing no 71#KerberosTgtPassing no