diff options
author | djm@openbsd.org <djm@openbsd.org> | 2019-01-19 21:41:18 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2019-01-20 09:45:17 +1100 |
commit | 3a00a921590d4c4b7e96df11bb10e6f9253ad45e (patch) | |
tree | 24186d71a6a77de7e303af919a4be64f2c7461bf /monitor_wrap.h | |
parent | 7ec5cb4d15ed2f2c5c9f5d00e6b361d136fc1e2d (diff) |
upstream: convert auth.c to new packet API
with & ok markus@
OpenBSD-Commit-ID: 7e10359f614ff522b52a3f05eec576257794e8e4
Diffstat (limited to 'monitor_wrap.h')
-rw-r--r-- | monitor_wrap.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/monitor_wrap.h b/monitor_wrap.h index 644da081d..19c58e486 100644 --- a/monitor_wrap.h +++ b/monitor_wrap.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: monitor_wrap.h,v 1.38 2018/07/11 18:53:29 markus Exp $ */ | 1 | /* $OpenBSD: monitor_wrap.h,v 1.39 2019/01/19 21:41:18 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright 2002 Niels Provos <provos@citi.umich.edu> | 4 | * Copyright 2002 Niels Provos <provos@citi.umich.edu> |
@@ -33,6 +33,7 @@ extern int use_privsep; | |||
33 | 33 | ||
34 | enum mm_keytype { MM_NOKEY, MM_HOSTKEY, MM_USERKEY }; | 34 | enum mm_keytype { MM_NOKEY, MM_HOSTKEY, MM_USERKEY }; |
35 | 35 | ||
36 | struct ssh; | ||
36 | struct monitor; | 37 | struct monitor; |
37 | struct Authctxt; | 38 | struct Authctxt; |
38 | struct sshkey; | 39 | struct sshkey; |
@@ -44,7 +45,7 @@ DH *mm_choose_dh(int, int, int); | |||
44 | int mm_sshkey_sign(struct sshkey *, u_char **, size_t *, const u_char *, size_t, | 45 | int mm_sshkey_sign(struct sshkey *, u_char **, size_t *, const u_char *, size_t, |
45 | const char *, u_int compat); | 46 | const char *, u_int compat); |
46 | void mm_inform_authserv(char *, char *); | 47 | void mm_inform_authserv(char *, char *); |
47 | struct passwd *mm_getpwnamallow(const char *); | 48 | struct passwd *mm_getpwnamallow(struct ssh *, const char *); |
48 | char *mm_auth2_read_banner(void); | 49 | char *mm_auth2_read_banner(void); |
49 | int mm_auth_password(struct ssh *, char *); | 50 | int mm_auth_password(struct ssh *, char *); |
50 | int mm_key_allowed(enum mm_keytype, const char *, const char *, struct sshkey *, | 51 | int mm_key_allowed(enum mm_keytype, const char *, const char *, struct sshkey *, |