Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/crypto/external/bsd/openssh/dist/channels.h,v
rcsdiff: /ftp/cvs/cvsroot/src/crypto/external/bsd/openssh/dist/channels.h,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.11.2.2
retrieving revision 1.12
diff -u -p -r1.11.2.2 -r1.12
--- src/crypto/external/bsd/openssh/dist/channels.h	2017/04/26 02:52:14	1.11.2.2
+++ src/crypto/external/bsd/openssh/dist/channels.h	2016/12/25 00:07:47	1.12
@@ -1,5 +1,5 @@
-/*	$NetBSD: channels.h,v 1.11.2.2 2017/04/26 02:52:14 pgoyette Exp $	*/
-/* $OpenBSD: channels.h,v 1.121 2017/02/01 02:59:09 dtucker Exp $ */
+/*	$NetBSD: channels.h,v 1.12 2016/12/25 00:07:47 christos Exp $	*/
+/* $OpenBSD: channels.h,v 1.120 2016/10/18 17:32:54 dtucker Exp $ */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -278,8 +278,7 @@ void	 channel_update_permitted_opens(int
 void	 channel_clear_permitted_opens(void);
 void	 channel_clear_adm_permitted_opens(void);
 void 	 channel_print_adm_permitted_opens(void);
-Channel	*channel_connect_to_port(const char *, u_short, const char *, const char *, int *,
-	     const char **);
+Channel	*channel_connect_to_port(const char *, u_short, const char *, const char *);
 Channel *channel_connect_to_path(const char *, const char *, const char *);
 Channel	*channel_connect_stdio_fwd(const char*, u_short, int, int);
 Channel	*channel_connect_by_listen_address(const char *, u_short,