RepoMirrors/openssh
1
0
Fork 0
mirror of git://anongit.mindrot.org/openssh.git synced 2025-01-11 12:09:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

- markus@cvs.openbsd.org 2001/06/03 14:55:39

Browse Source 
[channels.c channels.h session.c]
     use fatal_register_cleanup instead of atexit, sync with x11 authdir
     handling
This commit is contained in:
Ben Lindstrom 2001-06-09 01:11:59 +00:00
parent c4b7225b8d
commit 838394ca26
4 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -20,6 +20,10 @@
- markus@cvs.openbsd.org 2001/05/31 13:08:04 - markus@cvs.openbsd.org 2001/05/31 13:08:04
[sshd_config] [sshd_config]
group options and add some more comments group options and add some more comments
- markus@cvs.openbsd.org 2001/06/03 14:55:39
[channels.c channels.h session.c]
use fatal_register_cleanup instead of atexit, sync with x11 authdir
handling
20010606 20010606
- OpenBSD CVS Sync - OpenBSD CVS Sync
@ -5531,4 +5535,4 @@
- Wrote replacements for strlcpy and mkdtemp - Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1 - Released 1.0pre1
$Id: ChangeLog,v 1.1253 2001/06/09 01:09:51 mouring Exp $ $Id: ChangeLog,v 1.1254 2001/06/09 01:11:59 mouring Exp $

20
channels.c
View File

@ -40,7 +40,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: channels.c,v 1.121 2001/05/31 10:30:14 markus Exp $"); RCSID("$OpenBSD: channels.c,v 1.122 2001/06/03 14:55:38 markus Exp $");
#include "ssh.h" #include "ssh.h"
#include "ssh1.h" #include "ssh1.h"
@ -2777,10 +2777,13 @@ auth_get_socket_name()
/* removes the agent forwarding socket */ /* removes the agent forwarding socket */
void void
cleanup_socket(void) auth_sock_cleanup_proc(void *ignored)
{ {
unlink(auth_sock_name); if (auth_sock_name) {
rmdir(auth_sock_dir); unlink(auth_sock_name);
rmdir(auth_sock_dir);
auth_sock_name = NULL;
}
} }
/* /*
@ -2822,11 +2825,9 @@ auth_input_request_forwarding(struct passwd * pw)
snprintf(auth_sock_name, MAXPATHLEN, "%s/agent.%d", snprintf(auth_sock_name, MAXPATHLEN, "%s/agent.%d",
auth_sock_dir, (int) getpid()); auth_sock_dir, (int) getpid());
if (atexit(cleanup_socket) < 0) { /* delete agent socket on fatal() */
int saved = errno; fatal_add_cleanup(auth_sock_cleanup_proc, NULL);
cleanup_socket();
packet_disconnect("socket: %.100s", strerror(saved));
}
/* Create the socket. */ /* Create the socket. */
sock = socket(AF_UNIX, SOCK_STREAM, 0); sock = socket(AF_UNIX, SOCK_STREAM, 0);
if (sock < 0) if (sock < 0)
@ -2855,6 +2856,7 @@ auth_input_request_forwarding(struct passwd * pw)
0, xstrdup("auth socket"), 1); 0, xstrdup("auth socket"), 1);
if (nc == NULL) { if (nc == NULL) {
error("auth_input_request_forwarding: channel_new failed"); error("auth_input_request_forwarding: channel_new failed");
auth_sock_cleanup_proc(NULL);
close(sock); close(sock);
return 0; return 0;
} }

3
channels.h
View File

@ -32,7 +32,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
/* RCSID("$OpenBSD: channels.h,v 1.35 2001/05/31 10:30:15 markus Exp $"); */ /* RCSID("$OpenBSD: channels.h,v 1.36 2001/06/03 14:55:39 markus Exp $"); */
#ifndef CHANNEL_H #ifndef CHANNEL_H
#define CHANNEL_H #define CHANNEL_H
@ -223,6 +223,7 @@ void deny_input_open(int type, int plen, void *ctxt);
void auth_request_forwarding(void); void auth_request_forwarding(void);
char *auth_get_socket_name(void); char *auth_get_socket_name(void);
void auth_sock_cleanup_proc(void *ignored);
int auth_input_request_forwarding(struct passwd * pw); int auth_input_request_forwarding(struct passwd * pw);
void auth_input_open_request(int type, int plen, void *ctxt); void auth_input_open_request(int type, int plen, void *ctxt);

14
session.c
View File

@ -33,7 +33,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: session.c,v 1.78 2001/05/31 10:30:16 markus Exp $"); RCSID("$OpenBSD: session.c,v 1.79 2001/06/03 14:55:39 markus Exp $");
#include "ssh.h" #include "ssh.h"
#include "ssh1.h" #include "ssh1.h"
@ -132,6 +132,7 @@ void do_pre_login(Session *s);
void do_child(Session *s, const char *command); void do_child(Session *s, const char *command);
void do_motd(void); void do_motd(void);
int check_quietlogin(Session *s, const char *command); int check_quietlogin(Session *s, const char *command);
void xauthfile_cleanup_proc(void *ignore);
void do_authenticated1(Authctxt *authctxt); void do_authenticated1(Authctxt *authctxt);
void do_authenticated2(Authctxt *authctxt); void do_authenticated2(Authctxt *authctxt);
@ -196,6 +197,12 @@ do_authenticated(Authctxt *authctxt)
do_authenticated2(authctxt); do_authenticated2(authctxt);
else else
do_authenticated1(authctxt); do_authenticated1(authctxt);
/* remote user's local Xauthority file and agent socket */
if (xauthfile)
xauthfile_cleanup_proc(NULL);
if (auth_get_socket_name())
auth_sock_cleanup_proc(NULL);
} }
/* /*
@ -446,9 +453,6 @@ do_authenticated1(Authctxt *authctxt)
if (command != NULL) if (command != NULL)
xfree(command); xfree(command);
/* Cleanup user's local Xauthority file. */
if (xauthfile)
xauthfile_cleanup_proc(NULL);
return; return;
default: default:
@ -2105,6 +2109,4 @@ do_authenticated2(Authctxt *authctxt)
{ {
server_loop2(); server_loop2();
if (xauthfile)
xauthfile_cleanup_proc(NULL);
} }