diff options
| author | Kris Kennaway <kris@FreeBSD.org> | 2000-09-10 09:35:38 +0000 |
|---|---|---|
| committer | Kris Kennaway <kris@FreeBSD.org> | 2000-09-10 09:35:38 +0000 |
| commit | c2d3a5594b0773a8f655211251f0364b8c77e768 (patch) | |
| tree | 0d6c64368a8f92da624dfe130434c21480421df2 /crypto/openssh/servconf.h | |
| parent | 8925e63cd395e77b06bb3b966ff40dbcecd44abc (diff) | |
| download | src-c2d3a5594b0773a8f655211251f0364b8c77e768.tar.gz src-c2d3a5594b0773a8f655211251f0364b8c77e768.zip | |
Resolve conflicts and update for OpenSSH 2.2.0
Reviewed by: gshapiro, peter, green
Notes
Notes:
svn path=/head/; revision=65674
Diffstat (limited to 'crypto/openssh/servconf.h')
| -rw-r--r-- | crypto/openssh/servconf.h | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/crypto/openssh/servconf.h b/crypto/openssh/servconf.h index fedc9abaaf1c..1abf077bbb8e 100644 --- a/crypto/openssh/servconf.h +++ b/crypto/openssh/servconf.h @@ -1,20 +1,18 @@ /* - * - * servconf.h - * * Author: Tatu Ylonen <ylo@cs.hut.fi> - * * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * All rights reserved - * - * Created: Mon Aug 21 15:35:03 1995 ylo - * * Definitions for server configuration data and for the functions reading it. * - * $FreeBSD$ + * As far as I am concerned, the code I have written for this software + * can be used freely for any purpose. Any derived versions of this + * software must be clearly marked as such, and if the derived work is + * incompatible with the protocol description in the RFC file, it must be + * called by a name other than "ssh" or "Secure Shell". */ -/* RCSID("$Id: servconf.h,v 1.22 2000/05/06 17:45:37 markus Exp $"); */ +/* RCSID("$OpenBSD: servconf.h,v 1.28 2000/09/07 20:27:53 deraadt Exp $"); */ +/* $FreeBSD$ */ #ifndef SERVCONF_H #define SERVCONF_H @@ -25,6 +23,7 @@ #define MAX_DENY_USERS 256 /* Max # users on deny list. */ #define MAX_ALLOW_GROUPS 256 /* Max # groups on allow list. */ #define MAX_DENY_GROUPS 256 /* Max # groups on deny list. */ +#define MAX_SUBSYSTEMS 256 /* Max # subsystems. */ typedef struct { unsigned int num_ports; @@ -48,6 +47,7 @@ typedef struct { int x11_forwarding; /* If true, permit inet (spoofing) X11 fwd. */ int x11_display_offset; /* What DISPLAY number to start * searching at */ + 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. */ @@ -105,6 +105,15 @@ typedef struct { * connections_period. */ unsigned int connections_period; + + unsigned int num_subsystems; + char *subsystem_name[MAX_SUBSYSTEMS]; + char *subsystem_command[MAX_SUBSYSTEMS]; + + int max_startups_begin; + int max_startups_rate; + int max_startups; + } ServerOptions; /* * Initializes the server options to special values that indicate that they |