diff options
author | Damien Miller <djm@mindrot.org> | 2012-11-04 23:21:40 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2012-11-04 23:21:40 +1100 |
commit | a6e3f01d1e230b8acfdd6b4cf3096459d2a325e0 (patch) | |
tree | 577022d2b31e9519d26bc614c3f5396e17d58ec6 /servconf.h | |
parent | d0d1099b3b8a766480ce6df215631bf0af6e6bcd (diff) |
- djm@cvs.openbsd.org 2012/11/04 11:09:15
[auth.h auth1.c auth2.c monitor.c servconf.c servconf.h sshd.c]
[sshd_config.5]
Support multiple required authentication via an AuthenticationMethods
option. This option lists one or more comma-separated lists of
authentication method names. Successful completion of all the methods in
any list is required for authentication to complete;
feedback and ok markus@
Diffstat (limited to 'servconf.h')
-rw-r--r-- | servconf.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/servconf.h b/servconf.h index 0064c9bc5..68fcdb764 100644 --- a/servconf.h +++ b/servconf.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: servconf.h,v 1.104 2012/10/30 21:29:55 djm Exp $ */ | 1 | /* $OpenBSD: servconf.h,v 1.105 2012/11/04 11:09:15 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -28,6 +28,7 @@ | |||
28 | #define MAX_ACCEPT_ENV 256 /* Max # of env vars. */ | 28 | #define MAX_ACCEPT_ENV 256 /* Max # of env vars. */ |
29 | #define MAX_MATCH_GROUPS 256 /* Max # of groups for Match. */ | 29 | #define MAX_MATCH_GROUPS 256 /* Max # of groups for Match. */ |
30 | #define MAX_AUTHKEYS_FILES 256 /* Max # of authorized_keys files. */ | 30 | #define MAX_AUTHKEYS_FILES 256 /* Max # of authorized_keys files. */ |
31 | #define MAX_AUTH_METHODS 256 /* Max # of AuthenticationMethods. */ | ||
31 | 32 | ||
32 | /* permit_root_login */ | 33 | /* permit_root_login */ |
33 | #define PERMIT_NOT_SET -1 | 34 | #define PERMIT_NOT_SET -1 |
@@ -170,6 +171,9 @@ typedef struct { | |||
170 | char *authorized_keys_command_user; | 171 | char *authorized_keys_command_user; |
171 | 172 | ||
172 | char *version_addendum; /* Appended to SSH banner */ | 173 | char *version_addendum; /* Appended to SSH banner */ |
174 | |||
175 | u_int num_auth_methods; | ||
176 | char *auth_methods[MAX_AUTH_METHODS]; | ||
173 | } ServerOptions; | 177 | } ServerOptions; |
174 | 178 | ||
175 | /* Information about the incoming connection as used by Match */ | 179 | /* Information about the incoming connection as used by Match */ |
@@ -199,6 +203,7 @@ struct connection_info { | |||
199 | M_CP_STRARRAYOPT(allow_groups, num_allow_groups); \ | 203 | M_CP_STRARRAYOPT(allow_groups, num_allow_groups); \ |
200 | M_CP_STRARRAYOPT(deny_groups, num_deny_groups); \ | 204 | M_CP_STRARRAYOPT(deny_groups, num_deny_groups); \ |
201 | M_CP_STRARRAYOPT(accept_env, num_accept_env); \ | 205 | M_CP_STRARRAYOPT(accept_env, num_accept_env); \ |
206 | M_CP_STRARRAYOPT(auth_methods, num_auth_methods); \ | ||
202 | } while (0) | 207 | } while (0) |
203 | 208 | ||
204 | struct connection_info *get_connection_info(int, int); | 209 | struct connection_info *get_connection_info(int, int); |