- dugsong@cvs.openbsd.org 2001/06/26 16:15:25

[openssh.git] / servconf.h

diff --git a/servconf.h b/servconf.h
index a71b7c1353fa2a825ca7b4a34e81ae42621075cf..1b022028326b67c2e570d985d614daf6927c8292 100644 (file)
--- a/servconf.h
+++ b/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