diff options
author | djm <djm> | 2003-05-15 02:05:28 +0000 |
---|---|---|
committer | djm <djm> | 2003-05-15 02:05:28 +0000 |
commit | 6a0ceeb55328c6fee29bbc5f74b9b7af17645da0 (patch) | |
tree | f8d32e3915b23cb3f765fd80c1f3782e96663470 /servconf.h | |
parent | f70ef4aa244eb952df42d136f1598c9868a62d5f (diff) | |
download | openssh-6a0ceeb55328c6fee29bbc5f74b9b7af17645da0.tar.gz |
- jakob@cvs.openbsd.org 2003/05/15 01:48:10
[readconf.c readconf.h servconf.c servconf.h]
always parse kerberos options. ok djm@ markus@
- (djm) Always parse UsePAM
Diffstat (limited to 'servconf.h')
-rw-r--r-- | servconf.h | 8 |
1 files changed, 1 insertions, 7 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: servconf.h,v 1.59 2002/07/30 17:03:55 markus Exp $ */ +/* $OpenBSD: servconf.h,v 1.60 2003/05/15 01:48:10 jakob Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> @@ -73,7 +73,6 @@ 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. */ -#if defined(KRB4) || defined(KRB5) int kerberos_authentication; /* If true, permit Kerberos * authentication. */ int kerberos_or_local_passwd; /* If true, permit kerberos @@ -83,14 +82,9 @@ typedef struct { * /etc/passwd */ int kerberos_ticket_cleanup; /* If true, destroy ticket * file on logout. */ -#endif -#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 * authentication. */ int kbd_interactive_authentication; /* If true, permit */ |