summaryrefslogtreecommitdiff
path: root/servconf.h
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2009-12-29 21:38:40 +0000
committerColin Watson <cjwatson@debian.org>2009-12-29 21:38:40 +0000
commit1b816ea846aca3ee89e7995373ace609e9518424 (patch)
treeb41cdc8495cae7fa9c2e0f98a5f2e71656b61f9a /servconf.h
parentfa585019a79ebcb4e0202b1c33f87ff1c5c9ce1c (diff)
parent086ea76990b1e6287c24b6db74adffd4605eb3b0 (diff)
import openssh-4.6p1-gsskex-20070312.patch
Diffstat (limited to 'servconf.h')
-rw-r--r--servconf.h20
1 files changed, 15 insertions, 5 deletions
diff --git a/servconf.h b/servconf.h
index 0ef05bcd9..257de1c8b 100644
--- a/servconf.h
+++ b/servconf.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: servconf.h,v 1.72 2005/12/06 22:38:27 reyk Exp $ */ 1/* $OpenBSD: servconf.h,v 1.80 2007/02/19 10:45:58 dtucker Exp $ */
2 2
3/* 3/*
4 * Author: Tatu Ylonen <ylo@cs.hut.fi> 4 * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -16,8 +16,6 @@
16#ifndef SERVCONF_H 16#ifndef SERVCONF_H
17#define SERVCONF_H 17#define SERVCONF_H
18 18
19#include "buffer.h"
20
21#define MAX_PORTS 256 /* Max # ports. */ 19#define MAX_PORTS 256 /* Max # ports. */
22 20
23#define MAX_ALLOW_USERS 256 /* Max # users on allow list. */ 21#define MAX_ALLOW_USERS 256 /* Max # users on allow list. */
@@ -27,6 +25,7 @@
27#define MAX_SUBSYSTEMS 256 /* Max # subsystems. */ 25#define MAX_SUBSYSTEMS 256 /* Max # subsystems. */
28#define MAX_HOSTKEYS 256 /* Max # hostkeys. */ 26#define MAX_HOSTKEYS 256 /* Max # hostkeys. */
29#define MAX_ACCEPT_ENV 256 /* Max # of env vars. */ 27#define MAX_ACCEPT_ENV 256 /* Max # of env vars. */
28#define MAX_MATCH_GROUPS 256 /* Max # of groups for Match. */
30 29
31/* permit_root_login */ 30/* permit_root_login */
32#define PERMIT_NOT_SET -1 31#define PERMIT_NOT_SET -1
@@ -90,6 +89,7 @@ typedef struct {
90 int gss_authentication; /* If true, permit GSSAPI authentication */ 89 int gss_authentication; /* If true, permit GSSAPI authentication */
91 int gss_keyex; /* If true, permit GSSAPI key exchange */ 90 int gss_keyex; /* If true, permit GSSAPI key exchange */
92 int gss_cleanup_creds; /* If true, destroy cred cache on logout */ 91 int gss_cleanup_creds; /* If true, destroy cred cache on logout */
92 int gss_strict_acceptor; /* If true, restrict the GSSAPI acceptor name */
93 int password_authentication; /* If true, permit password 93 int password_authentication; /* If true, permit password
94 * authentication. */ 94 * authentication. */
95 int kbd_interactive_authentication; /* If true, permit */ 95 int kbd_interactive_authentication; /* If true, permit */
@@ -112,6 +112,7 @@ typedef struct {
112 u_int num_subsystems; 112 u_int num_subsystems;
113 char *subsystem_name[MAX_SUBSYSTEMS]; 113 char *subsystem_name[MAX_SUBSYSTEMS];
114 char *subsystem_command[MAX_SUBSYSTEMS]; 114 char *subsystem_command[MAX_SUBSYSTEMS];
115 char *subsystem_args[MAX_SUBSYSTEMS];
115 116
116 u_int num_accept_env; 117 u_int num_accept_env;
117 char *accept_env[MAX_ACCEPT_ENV]; 118 char *accept_env[MAX_ACCEPT_ENV];
@@ -135,15 +136,24 @@ typedef struct {
135 char *authorized_keys_file; /* File containing public keys */ 136 char *authorized_keys_file; /* File containing public keys */
136 char *authorized_keys_file2; 137 char *authorized_keys_file2;
137 138
139 char *adm_forced_command;
140
138 int use_pam; /* Enable auth via PAM */ 141 int use_pam; /* Enable auth via PAM */
139 142
140 int permit_tun; 143 int permit_tun;
144
145 int num_permitted_opens;
141} ServerOptions; 146} ServerOptions;
142 147
143void initialize_server_options(ServerOptions *); 148void initialize_server_options(ServerOptions *);
144void fill_default_server_options(ServerOptions *); 149void fill_default_server_options(ServerOptions *);
145int process_server_config_line(ServerOptions *, char *, const char *, int); 150int process_server_config_line(ServerOptions *, char *, const char *, int,
151 int *, const char *, const char *, const char *);
146void load_server_config(const char *, Buffer *); 152void load_server_config(const char *, Buffer *);
147void parse_server_config(ServerOptions *, const char *, Buffer *); 153void parse_server_config(ServerOptions *, const char *, Buffer *,
154 const char *, const char *, const char *);
155void parse_server_match_config(ServerOptions *, const char *, const char *,
156 const char *);
157void copy_set_server_options(ServerOptions *, ServerOptions *, int);
148 158
149#endif /* SERVCONF_H */ 159#endif /* SERVCONF_H */