diff options
| author | Gordon Tetlow <gordon@FreeBSD.org> | 2023-12-26 12:49:13 -0800 |
|---|---|---|
| committer | Gordon Tetlow <gordon@FreeBSD.org> | 2023-12-26 12:49:13 -0800 |
| commit | 277b9fe50d9e7f7b21eb2f3b052f8ea22a3d77d2 (patch) | |
| tree | 723a9b11daa0e26c8e0f248d296fd397c1f7f6c2 /security/openssh-portable/files/patch-ssh-agent.c | |
| parent | audio/exhale: Update to 1.2.1 (diff) | |
security/openssh-portable: Update to 9.6p1
Approved by: bdrewery
Differential Revision: https://reviews.freebsd.org/D43132
Diffstat (limited to 'security/openssh-portable/files/patch-ssh-agent.c')
| -rw-r--r-- | security/openssh-portable/files/patch-ssh-agent.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/security/openssh-portable/files/patch-ssh-agent.c b/security/openssh-portable/files/patch-ssh-agent.c index 9fc1abc0dfab..cd85012d883f 100644 --- a/security/openssh-portable/files/patch-ssh-agent.c +++ b/security/openssh-portable/files/patch-ssh-agent.c @@ -8,9 +8,9 @@ r226103 | des | 2011-10-07 08:10:16 -0500 (Fri, 07 Oct 2011) | 5 lines Add a -x option that causes ssh-agent(1) to exit when all clients have disconnected. ---- ssh-agent.c.orig 2023-02-02 04:21:54.000000000 -0800 -+++ ssh-agent.c 2023-02-03 10:55:34.277561000 -0800 -@@ -188,11 +188,28 @@ static int restrict_websafe = 1; +--- ssh-agent.c.orig 2023-12-18 06:59:50.000000000 -0800 ++++ ssh-agent.c 2023-12-19 17:16:22.128981000 -0800 +@@ -196,11 +196,28 @@ /* Refuse signing of non-SSH messages for web-origin FIDO keys */ static int restrict_websafe = 1; @@ -39,7 +39,7 @@ disconnected. close(e->fd); sshbuf_free(e->input); sshbuf_free(e->output); -@@ -205,6 +222,8 @@ close_socket(SocketEntry *e) +@@ -213,6 +230,8 @@ memset(e, '\0', sizeof(*e)); e->fd = -1; e->type = AUTH_UNUSED; @@ -48,7 +48,7 @@ disconnected. } static void -@@ -1698,6 +1717,10 @@ new_socket(sock_type type, int fd) +@@ -1893,6 +1912,10 @@ debug_f("type = %s", type == AUTH_CONNECTION ? "CONNECTION" : (type == AUTH_SOCKET ? "SOCKET" : "UNKNOWN")); @@ -59,7 +59,7 @@ disconnected. set_nonblock(fd); if (fd > max_fd) -@@ -1990,7 +2013,7 @@ usage(void) +@@ -2184,7 +2207,7 @@ usage(void) { fprintf(stderr, @@ -68,15 +68,15 @@ disconnected. " [-O option] [-P allowed_providers] [-t life]\n" " ssh-agent [-a bind_address] [-E fingerprint_hash] [-O option]\n" " [-P allowed_providers] [-t life] command [arg ...]\n" -@@ -2024,6 +2047,7 @@ main(int ac, char **av) +@@ -2218,6 +2241,7 @@ /* drop */ - setegid(getgid()); - setgid(getgid()); -+ setuid(geteuid()); + (void)setegid(getgid()); + (void)setgid(getgid()); ++ (void)setuid(geteuid()); platform_disable_tracing(0); /* strict=no */ -@@ -2035,7 +2059,7 @@ main(int ac, char **av) +@@ -2229,7 +2253,7 @@ __progname = ssh_get_progname(av[0]); seed_rng(); @@ -85,7 +85,7 @@ disconnected. switch (ch) { case 'E': fingerprint_hash = ssh_digest_alg_by_name(optarg); -@@ -2084,6 +2108,9 @@ main(int ac, char **av) +@@ -2280,6 +2304,9 @@ fprintf(stderr, "Invalid lifetime\n"); usage(); } |