From 279b0fa809e30e3a007bbc4b2adb1ccbd4d4a87a Mon Sep 17 00:00:00 2001 From: des Date: Tue, 29 Oct 2002 10:16:02 +0000 Subject: Resolve conflicts. --- crypto/openssh/readconf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'crypto/openssh/readconf.c') diff --git a/crypto/openssh/readconf.c b/crypto/openssh/readconf.c index d45df25..716b542 100644 --- a/crypto/openssh/readconf.c +++ b/crypto/openssh/readconf.c @@ -202,7 +202,7 @@ add_local_forward(Options *options, u_short port, const char *host, u_short host_port) { Forward *fwd; -#ifndef HAVE_CYGWIN +#ifndef NO_IPPORT_RESERVED_CONCEPT extern uid_t original_real_uid; if (port < IPPORT_RESERVED && original_real_uid != 0) fatal("Privileged ports can only be forwarded by root."); -- cgit v1.1