summaryrefslogtreecommitdiff
path: root/usr.bin/ssh/servconf.h
diff options
context:
space:
mode:
authorDug Song <dugsong@cvs.openbsd.org>2001-06-26 16:15:27 +0000
committerDug Song <dugsong@cvs.openbsd.org>2001-06-26 16:15:27 +0000
commitd15f7390f22a2c0cb3f0398e4120484ecaa94d1e (patch)
tree4518f2b9aa4d81ccab449c3c8bc4cefc87ceb6d1 /usr.bin/ssh/servconf.h
parentf43cafe3684913dea70621cbc8f3042cd12caf0c (diff)
Kerberos v5 support for SSH1, mostly from Assar Westerlund <assar@freebsd.org> and Bjorn Gronvall <bg@sics.se>. markus@ ok
Diffstat (limited to 'usr.bin/ssh/servconf.h')
-rw-r--r--usr.bin/ssh/servconf.h10
1 files changed, 6 insertions, 4 deletions
diff --git a/usr.bin/ssh/servconf.h b/usr.bin/ssh/servconf.h
index 9fdf7794868..715c20acfcf 100644
--- a/usr.bin/ssh/servconf.h
+++ b/usr.bin/ssh/servconf.h
@@ -11,7 +11,7 @@
* called by a name other than "ssh" or "Secure Shell".
*/
-/* RCSID("$OpenBSD: servconf.h,v 1.45 2001/06/26 06:33:00 itojun Exp $"); */
+/* RCSID("$OpenBSD: servconf.h,v 1.46 2001/06/26 16:15:24 dugsong Exp $"); */
#ifndef SERVCONF_H
#define SERVCONF_H
@@ -73,7 +73,7 @@ typedef struct {
int hostbased_uses_name_from_packet_only; /* experimental */
int rsa_authentication; /* If true, permit RSA authentication. */
int pubkey_authentication; /* If true, permit ssh2 pubkey authentication. */
-#ifdef KRB4
+#if defined(KRB4) || defined(KRB5)
int kerberos_authentication; /* If true, permit Kerberos
* authentication. */
int kerberos_or_local_passwd; /* If true, permit kerberos
@@ -84,9 +84,11 @@ typedef struct {
int kerberos_ticket_cleanup; /* If true, destroy ticket
* file on logout. */
#endif
-#ifdef AFS
- int kerberos_tgt_passing; /* If true, permit Kerberos tgt
+#if defined(AFS) || defined(KRB5)
+ int kerberos_tgt_passing; /* If true, permit Kerberos TGT
* passing. */
+#endif
+#ifdef AFS
int afs_token_passing; /* If true, permit AFS token passing. */
#endif
int password_authentication; /* If true, permit password