diff options
| author |   markus <markus@openbsd.org> | 2001-06-04 21:59:42 +0000 |
|---|---|---|
| committer | markus <markus@openbsd.org> | 2001-06-04 21:59:42 +0000 |
| commit | ef33df9a97a0031f0dee343470ee2c2e65ca6be0 (patch) | |
| tree | e966f305ce8aba7a6a61069d494e610163e4c645 /usr.bin/ssh/channels.c | |
| parent | remove the "must be free" clause: (diff) | |
| download | wireguard-openbsd-ef33df9a97a0031f0dee343470ee2c2e65ca6be0.tar.xz wireguard-openbsd-ef33df9a97a0031f0dee343470ee2c2e65ca6be0.zip | |
switch uid when cleaning up tmp files and sockets; reported by zen-parse@gmx.net on bugtraq
Diffstat (limited to 'usr.bin/ssh/channels.c')
| -rw-r--r-- | usr.bin/ssh/channels.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/usr.bin/ssh/channels.c b/usr.bin/ssh/channels.c index e87348881b3..a7f83f60459 100644 --- a/usr.bin/ssh/channels.c +++ b/usr.bin/ssh/channels.c @@ -40,7 +40,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: channels.c,v 1.122 2001/06/03 14:55:38 markus Exp $"); +RCSID("$OpenBSD: channels.c,v 1.123 2001/06/04 21:59:42 markus Exp $"); #include "ssh.h" #include "ssh1.h" @@ -2720,12 +2720,16 @@ auth_get_socket_name() /* removes the agent forwarding socket */ void -auth_sock_cleanup_proc(void *ignored) +auth_sock_cleanup_proc(void *_pw) { + struct passwd *pw = _pw; + if (auth_sock_name) { + temporarily_use_uid(pw); unlink(auth_sock_name); rmdir(auth_sock_dir); auth_sock_name = NULL; + restore_uid(); } } @@ -2769,7 +2773,7 @@ auth_input_request_forwarding(struct passwd * pw) auth_sock_dir, (int) getpid()); /* delete agent socket on fatal() */ - fatal_add_cleanup(auth_sock_cleanup_proc, NULL); + fatal_add_cleanup(auth_sock_cleanup_proc, pw); /* Create the socket. */ sock = socket(AF_UNIX, SOCK_STREAM, 0); @@ -2799,7 +2803,7 @@ auth_input_request_forwarding(struct passwd * pw) 0, xstrdup("auth socket"), 1); if (nc == NULL) { error("auth_input_request_forwarding: channel_new failed"); - auth_sock_cleanup_proc(NULL); + auth_sock_cleanup_proc(pw); close(sock); return 0; } |