diff options
Diffstat (limited to 'sshconnect.h')
-rw-r--r-- | sshconnect.h | 24 |
1 files changed, 2 insertions, 22 deletions
diff --git a/sshconnect.h b/sshconnect.h index dd648b096..890d85733 100644 --- a/sshconnect.h +++ b/sshconnect.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshconnect.h,v 1.32 2018/02/10 09:25:35 djm Exp $ */ | 1 | /* $OpenBSD: sshconnect.h,v 1.35 2018/07/19 10:28:47 dtucker Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 4 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
@@ -28,14 +28,13 @@ typedef struct Sensitive Sensitive; | |||
28 | struct Sensitive { | 28 | struct Sensitive { |
29 | struct sshkey **keys; | 29 | struct sshkey **keys; |
30 | int nkeys; | 30 | int nkeys; |
31 | int external_keysign; | ||
32 | }; | 31 | }; |
33 | 32 | ||
34 | struct addrinfo; | 33 | struct addrinfo; |
35 | struct ssh; | 34 | struct ssh; |
36 | 35 | ||
37 | int ssh_connect(struct ssh *, const char *, struct addrinfo *, | 36 | int ssh_connect(struct ssh *, const char *, struct addrinfo *, |
38 | struct sockaddr_storage *, u_short, int, int, int *, int, int); | 37 | struct sockaddr_storage *, u_short, int, int, int *, int); |
39 | void ssh_kill_proxy_command(void); | 38 | void ssh_kill_proxy_command(void); |
40 | 39 | ||
41 | void ssh_login(Sensitive *, const char *, struct sockaddr *, u_short, | 40 | void ssh_login(Sensitive *, const char *, struct sockaddr *, u_short, |
@@ -58,22 +57,3 @@ void ssh_put_password(char *); | |||
58 | int ssh_local_cmd(const char *); | 57 | int ssh_local_cmd(const char *); |
59 | 58 | ||
60 | void maybe_add_key_to_agent(char *, const struct sshkey *, char *, char *); | 59 | void maybe_add_key_to_agent(char *, const struct sshkey *, char *, char *); |
61 | |||
62 | /* | ||
63 | * Macros to raise/lower permissions. | ||
64 | */ | ||
65 | #define PRIV_START do { \ | ||
66 | int save_errno = errno; \ | ||
67 | if (seteuid(original_effective_uid) != 0) \ | ||
68 | fatal("PRIV_START: seteuid: %s", \ | ||
69 | strerror(errno)); \ | ||
70 | errno = save_errno; \ | ||
71 | } while (0) | ||
72 | |||
73 | #define PRIV_END do { \ | ||
74 | int save_errno = errno; \ | ||
75 | if (seteuid(original_real_uid) != 0) \ | ||
76 | fatal("PRIV_END: seteuid: %s", \ | ||
77 | strerror(errno)); \ | ||
78 | errno = save_errno; \ | ||
79 | } while (0) | ||