diff options
author | des <des@FreeBSD.org> | 2004-02-26 10:52:33 +0000 |
---|---|---|
committer | des <des@FreeBSD.org> | 2004-02-26 10:52:33 +0000 |
commit | 124c4a14153799ec55cc535db5222b1780208aa1 (patch) | |
tree | 91bbaf12f7d9b9158ae725f996c95f18038af40c /crypto/openssh/session.h | |
parent | 1754c77e5e8ce4ec5f746dc5ce34e4cb54e3130f (diff) | |
download | FreeBSD-src-124c4a14153799ec55cc535db5222b1780208aa1.zip FreeBSD-src-124c4a14153799ec55cc535db5222b1780208aa1.tar.gz |
Resolve conflicts.
Diffstat (limited to 'crypto/openssh/session.h')
-rw-r--r-- | crypto/openssh/session.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/crypto/openssh/session.h b/crypto/openssh/session.h index 525e47f..405b8fe 100644 --- a/crypto/openssh/session.h +++ b/crypto/openssh/session.h @@ -1,4 +1,4 @@ -/* $OpenBSD: session.h,v 1.20 2003/08/22 10:56:09 markus Exp $ */ +/* $OpenBSD: session.h,v 1.21 2003/09/23 20:17:11 markus Exp $ */ /* * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. @@ -56,13 +56,14 @@ struct Session { }; void do_authenticated(Authctxt *); +void do_cleanup(Authctxt *); int session_open(Authctxt *, int); int session_input_channel_req(Channel *, const char *); void session_close_by_pid(pid_t, int); void session_close_by_channel(int, void *); void session_destroy_all(void (*)(Session *)); -void session_pty_cleanup2(void *); +void session_pty_cleanup2(Session *); Session *session_new(void); Session *session_by_tty(char *); |