Author: des
Date: Sun Feb 26 16:34:58 2017
New Revision: 314304
URL: https://svnweb.freebsd.org/changeset/base/314304
Log:
Fix amusingly harmless mis-merge.
Modified:
head/crypto/openssh/readconf.c
Modified: head/crypto/openssh/readconf.c
==============================================================================
--- head/crypto/openssh/readconf.c Sun Feb 26 16:00:20 2017
(r314303)
+++ head/crypto/openssh/readconf.c Sun Feb 26 16:34:58 2017
(r314304)
@@ -319,7 +319,6 @@ add_local_forward(Options *options, cons
#else
ipport_reserved = IPPORT_RESERVED;
#endif
- if (newfwd->listen_port < ipport_reserved && original_real_uid != 0)
if (newfwd->listen_port < ipport_reserved && original_real_uid != 0 &&
newfwd->listen_path == NULL)
fatal("Privileged ports can only be forwarded by root.");
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
