===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/servconf.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- src/usr.bin/ssh/servconf.h	1999/09/28 07:56:47	1.2
+++ src/usr.bin/ssh/servconf.h	1999/09/29 18:16:20	1.3
@@ -13,7 +13,7 @@
 
 */
 
-/* RCSID("$Id: servconf.h,v 1.2 1999/09/28 07:56:47 deraadt Exp $"); */
+/* RCSID("$Id: servconf.h,v 1.3 1999/09/29 18:16:20 dugsong Exp $"); */
 
 #ifndef SERVCONF_H
 #define SERVCONF_H
@@ -45,15 +45,13 @@
   int rsa_authentication;	/* If true, permit RSA authentication. */
 #ifdef KRB4
   int kerberos_authentication;	/* If true, permit Kerberos authentication. */
-  int kerberos_or_local_passwd;
-#endif
-#if defined(KRB4) || defined(AFS)
+  int kerberos_or_local_passwd;	/* If true, permit kerberos and any other
+				   password authentication mechanism, such
+				   as SecurID or /etc/passwd */
   int kerberos_ticket_cleanup;	/* If true, destroy ticket file on logout. */
 #endif
-#ifdef KERBEROS_TGT_PASSING
-  int kerberos_tgt_passing;	/* If true, permit Kerberos tgt passing. */
-#endif
 #ifdef AFS
+  int kerberos_tgt_passing;	/* If true, permit Kerberos tgt passing. */
   int afs_token_passing;	/* If true, permit AFS token passing. */
 #endif
   int password_authentication;  /* If true, permit password authentication. */