- OpenBSD CVS Sync

[openssh.git] / servconf.h

diff --git a/servconf.h b/servconf.h
index a71b7c1353fa2a825ca7b4a34e81ae42621075cf..55f2ee2874022387641b176c5ef978227a364ab1 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.47 2001/06/26 17:27:24 markus 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
@@ -124,23 +126,15 @@ typedef struct {
                                         * for this many intervals, above
                                         * diconnect the session 
                                         */
-       char   *authorized_keys_file;   /* File containing public RSA keys */ 
-       char   *authorized_keys_file2;  /* File containing public SSH2 keys */
+
+       char   *authorized_keys_file;   /* File containing public keys */
+       char   *authorized_keys_file2;
        int     pam_authentication_via_kbd_int;
-}       ServerOptions;
-/*
- * Initializes the server options to special values that indicate that they
- * have not yet been set.
- */
-void    initialize_server_options(ServerOptions *);
 
-/*
- * Reads the server configuration file.  This only sets the values for those
- * options that have the special value indicating they have not been set.
- */
-void    read_server_config(ServerOptions *, const char *);
+}       ServerOptions;
 
-/* Sets values for those values that have not yet been set. */
-void    fill_default_server_options(ServerOptions *);
+void    initialize_server_options(ServerOptions *);
+void    read_server_config(ServerOptions *, const char *);
+void    fill_default_server_options(ServerOptions *);
 
 #endif                         /* SERVCONF_H */