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 /authfd.h | |
parent | 964476f91b66c475d5b8fa1e8b28d39a97a1b56e (diff) | |
parent | 004a7fb9c6a00b13dc98f56599918a54a3506d10 (diff) |
merge 5.4p1
Diffstat (limited to 'authfd.h')
-rw-r--r-- | authfd.h | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: authfd.h,v 1.36 2006/08/03 03:34:41 deraadt Exp $ */ | 1 | /* $OpenBSD: authfd.h,v 1.37 2009/08/27 17:44:52 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -75,7 +75,6 @@ void ssh_close_authentication_connection(AuthenticationConnection *); | |||
75 | int ssh_get_num_identities(AuthenticationConnection *, int); | 75 | int ssh_get_num_identities(AuthenticationConnection *, int); |
76 | Key *ssh_get_first_identity(AuthenticationConnection *, char **, int); | 76 | Key *ssh_get_first_identity(AuthenticationConnection *, char **, int); |
77 | Key *ssh_get_next_identity(AuthenticationConnection *, char **, int); | 77 | Key *ssh_get_next_identity(AuthenticationConnection *, char **, int); |
78 | int ssh_add_identity(AuthenticationConnection *, Key *, const char *); | ||
79 | int ssh_add_identity_constrained(AuthenticationConnection *, Key *, | 78 | int ssh_add_identity_constrained(AuthenticationConnection *, Key *, |
80 | const char *, u_int, u_int); | 79 | const char *, u_int, u_int); |
81 | int ssh_remove_identity(AuthenticationConnection *, Key *); | 80 | int ssh_remove_identity(AuthenticationConnection *, Key *); |