- (tim) [configure.ac] Bug 1078. Fix --without-kerberos5. Reported by

[openssh.git] / channels.h

diff --git a/channels.h b/channels.h
index f8dc8249c2a24cb184ce76161da8b8f6540c1bfe..1cb2c3a3424bfaa2c5cd0f45d89e0a05fdd2f39c 100644 (file)
--- a/channels.h
+++ b/channels.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: channels.h,v 1.74 2004/08/11 21:43:04 avsm Exp $      */
+/*     $OpenBSD: channels.h,v 1.79 2005/07/17 06:49:04 djm Exp $       */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -79,6 +79,7 @@ struct Channel {
        int     ctl_fd;         /* control fd (client sharing) */
        int     isatty;         /* rfd is a tty */
        int     wfd_isatty;     /* wfd is a tty */
+       int     client_tty;     /* (client) TTY has been requested */
        int     force_drain;    /* force close on iEOF */
        int     delayed;                /* fdset hack */
        Buffer  input;          /* data read from socket, to be sent over
@@ -148,7 +149,7 @@ struct Channel {
        buffer_len(&c->extended) > 0))
 #define CHANNEL_EFD_OUTPUT_ACTIVE(c) \
        (compat20 && c->extended_usage == CHAN_EXTENDED_WRITE && \
-       ((c->efd != -1 && !(c->flags & (CHAN_EOF_RCVD|CHAN_CLOSE_RCVD))) || \
+       c->efd != -1 && (!(c->flags & (CHAN_EOF_RCVD|CHAN_CLOSE_RCVD)) || \
        buffer_len(&c->extended) > 0))
 
 /* channel management */
@@ -202,18 +203,21 @@ void       channel_clear_permitted_opens(void);
 void     channel_input_port_forward_request(int, int);
 int     channel_connect_to(const char *, u_short);
 int     channel_connect_by_listen_address(u_short);
-void    channel_request_remote_forwarding(u_short, const char *, u_short);
-void    channel_request_rforward_cancel(u_short port);
-int     channel_setup_local_fwd_listener(u_short, const char *, u_short, int);
+void    channel_request_remote_forwarding(const char *, u_short,
+            const char *, u_short);
+int     channel_setup_local_fwd_listener(const char *, u_short,
+            const char *, u_short, int);
+void    channel_request_rforward_cancel(const char *host, u_short port);
 int     channel_setup_remote_fwd_listener(const char *, u_short, int);
 int     channel_cancel_rport_listener(const char *, u_short);
 
 /* x11 forwarding */
 
 int     x11_connect_display(void);
-int     x11_create_display_inet(int, int, int, u_int *);
+int     x11_create_display_inet(int, int, int, u_int *, int **);
 void     x11_input_open(int, u_int32_t, void *);
-void    x11_request_forwarding_with_spoofing(int, const char *, const char *);
+void    x11_request_forwarding_with_spoofing(int, const char *, const char *,
+           const char *);
 void    deny_input_open(int, u_int32_t, void *);
 
 /* agent forwarding */