diff options
author | Colin Watson <cjwatson@debian.org> | 2010-03-31 00:48:57 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2010-03-31 00:48:57 +0100 |
commit | d1a87e462e1db89f19cd960588d0c6b287cb5ccc (patch) | |
tree | f0d13e1687800f36a3c4322b94ac5230ad17bdbf /auth-options.h | |
parent | 964476f91b66c475d5b8fa1e8b28d39a97a1b56e (diff) | |
parent | 004a7fb9c6a00b13dc98f56599918a54a3506d10 (diff) |
merge 5.4p1
Diffstat (limited to 'auth-options.h')
-rw-r--r-- | auth-options.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/auth-options.h b/auth-options.h index 14488f72d..694edc842 100644 --- a/auth-options.h +++ b/auth-options.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: auth-options.h,v 1.17 2008/03/26 21:28:14 djm Exp $ */ | 1 | /* $OpenBSD: auth-options.h,v 1.18 2010/02/26 20:29:54 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -30,8 +30,10 @@ extern int no_user_rc; | |||
30 | extern char *forced_command; | 30 | extern char *forced_command; |
31 | extern struct envstring *custom_environment; | 31 | extern struct envstring *custom_environment; |
32 | extern int forced_tun_device; | 32 | extern int forced_tun_device; |
33 | extern int key_is_cert_authority; | ||
33 | 34 | ||
34 | int auth_parse_options(struct passwd *, char *, char *, u_long); | 35 | int auth_parse_options(struct passwd *, char *, char *, u_long); |
35 | void auth_clear_options(void); | 36 | void auth_clear_options(void); |
37 | int auth_cert_constraints(Buffer *, struct passwd *); | ||
36 | 38 | ||
37 | #endif | 39 | #endif |