- markus@cvs.openbsd.org 2001/03/23 14:28:32

[openssh.git] / servconf.h

diff --git a/servconf.h b/servconf.h
index 3ecf6a00d52fa17dfae3154938158ba664ba47e7..1009ce217ac0b2f8917582143e1bc9d09647511b 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.31 2000/11/12 19:50:38 markus Exp $"); */
+/* RCSID("$OpenBSD: servconf.h,v 1.38 2001/02/12 16:16:23 markus Exp $"); */
 
 #ifndef SERVCONF_H
 #define SERVCONF_H
@@ -25,9 +25,17 @@
 #define MAX_SUBSYSTEMS         256     /* Max # subsystems. */
 #define MAX_HOSTKEYS           256     /* Max # hostkeys. */
 
+/* permit_root_login */
+#define        PERMIT_NOT_SET          -1
+#define        PERMIT_NO               0
+#define        PERMIT_FORCED_ONLY      1
+#define        PERMIT_NO_PASSWD        2
+#define        PERMIT_YES              3
+
+
 typedef struct {
-       unsigned int num_ports;
-       unsigned int ports_from_cmdline;
+       u_int num_ports;
+       u_int ports_from_cmdline;
        u_short ports[MAX_PORTS];       /* Port number to listen on. */
        char   *listen_addr;            /* Address on which the server listens. */
        struct addrinfo *listen_addrs;  /* Addresses on which the server listens. */
@@ -38,7 +46,7 @@ typedef struct {
        int     login_grace_time;       /* Disconnect if no auth in this time
                                         * (sec). */
        int     key_regeneration_time;  /* Server key lifetime (seconds). */
-       int     permit_root_login;      /* If true, permit root login. */
+       int     permit_root_login;      /* PERMIT_*, see above */
        int     ignore_rhosts;  /* Ignore .rhosts and .shosts. */
        int     ignore_user_known_hosts;        /* Ignore ~/.ssh/known_hosts
                                                 * for RhostsRsaAuth */
@@ -50,8 +58,9 @@ typedef struct {
        char   *xauth_location; /* Location of xauth program */
        int     strict_modes;   /* If true, require string home dir modes. */
        int     keepalives;     /* If true, set SO_KEEPALIVE. */
-       char   *ciphers;        /* Ciphers in order of preference. */
-       int     protocol;       /* Protocol in order of preference. */
+       char   *ciphers;        /* Supported SSH2 ciphers. */
+       char   *macs;           /* Supported SSH2 macs. */
+       int     protocol;       /* Supported protocol versions. */
        int     gateway_ports;  /* If true, allow remote connects to forwarded ports. */
        SyslogFacility log_facility;    /* Facility for system logging. */
        LogLevel log_level;     /* Level for system logging. */
@@ -80,30 +89,29 @@ typedef struct {
        int     password_authentication;        /* If true, permit password
                                                 * authentication. */
        int     kbd_interactive_authentication; /* If true, permit */
-#ifdef SKEY
-       int     skey_authentication;    /* If true, permit s/key
-                                        * authentication. */
-#endif
+       int     challenge_reponse_authentication;
        int     permit_empty_passwd;    /* If false, do not permit empty
                                         * passwords. */
        int     use_login;      /* If true, login(1) is used */
        int     allow_tcp_forwarding;
-       unsigned int num_allow_users;
+       u_int num_allow_users;
        char   *allow_users[MAX_ALLOW_USERS];
-       unsigned int num_deny_users;
+       u_int num_deny_users;
        char   *deny_users[MAX_DENY_USERS];
-       unsigned int num_allow_groups;
+       u_int num_allow_groups;
        char   *allow_groups[MAX_ALLOW_GROUPS];
-       unsigned int num_deny_groups;
+       u_int num_deny_groups;
        char   *deny_groups[MAX_DENY_GROUPS];
 
-       unsigned int num_subsystems;
+       u_int num_subsystems;
        char   *subsystem_name[MAX_SUBSYSTEMS];
        char   *subsystem_command[MAX_SUBSYSTEMS];
 
        int     max_startups_begin;
        int     max_startups_rate;
        int     max_startups;
+       char   *banner;                 /* SSH-2 banner message */
+       int     reverse_mapping_check;  /* cross-check ip and dns */
 
 }       ServerOptions;
 /*