diff options
| author | Dag-Erling Smørgrav <des@FreeBSD.org> | 2005-09-03 07:04:25 +0000 |
|---|---|---|
| committer | Dag-Erling Smørgrav <des@FreeBSD.org> | 2005-09-03 07:04:25 +0000 |
| commit | d4ecd1085791f1e31b106a2546b08647fd6a2a17 (patch) | |
| tree | 15c858fecc18a67f9dcc639fd5be6afa6ed7037f /crypto/openssh/serverloop.c | |
| parent | f8a2a7f14a354d1231b54c452245604bf11bed62 (diff) | |
| download | src-d4ecd1085791f1e31b106a2546b08647fd6a2a17.tar.gz src-d4ecd1085791f1e31b106a2546b08647fd6a2a17.zip | |
Resolve conflicts.
Notes
Notes:
svn path=/head/; revision=149753
Diffstat (limited to 'crypto/openssh/serverloop.c')
| -rw-r--r-- | crypto/openssh/serverloop.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crypto/openssh/serverloop.c b/crypto/openssh/serverloop.c index eee1e7959847..d2eff170a904 100644 --- a/crypto/openssh/serverloop.c +++ b/crypto/openssh/serverloop.c @@ -35,7 +35,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: serverloop.c,v 1.117 2004/08/11 21:43:05 avsm Exp $"); +RCSID("$OpenBSD: serverloop.c,v 1.118 2005/07/17 07:17:55 djm Exp $"); #include "xmalloc.h" #include "packet.h" @@ -865,7 +865,7 @@ server_request_direct_tcpip(void) packet_check_eom(); debug("server_request_direct_tcpip: originator %s port %d, target %s port %d", - originator, originator_port, target, target_port); + originator, originator_port, target, target_port); /* XXX check permission */ sock = channel_connect_to(target, target_port); @@ -983,7 +983,7 @@ server_input_global_request(int type, u_int32_t seq, void *ctxt) #ifndef NO_IPPORT_RESERVED_CONCEPT || (listen_port < IPPORT_RESERVED && pw->pw_uid != 0) #endif - ) { + ) { success = 0; packet_send_debug("Server has disabled port forwarding."); } else { |