summaryrefslogtreecommitdiff
path: root/security/stunnel/files/patch-src::client.c
diff options
context:
space:
mode:
authorPeter Pentchev <roam@FreeBSD.org>2011-02-10 09:34:59 +0000
committerPeter Pentchev <roam@FreeBSD.org>2011-02-10 09:34:59 +0000
commit5bafc9702d22cb28e352caeaa78998afcfec1cf2 (patch)
tree52c10b7880b404661a0af2f59909070da88803db /security/stunnel/files/patch-src::client.c
parentUpdate to 1.1.6. (diff)
Update to stunnel-4.35:
- drop the transparent proxying patch, integrated upstream - while I'm here, fix the very first master site URL - the download page on stunnel.org just links to the sites now, and does not contain downloadable source PR: 154631 Submitted by: Tsurutani Naoki <turutani@scphys.kyoto-u.ac.jp>
Notes
Notes: svn path=/head/; revision=268859
Diffstat (limited to 'security/stunnel/files/patch-src::client.c')
-rw-r--r--security/stunnel/files/patch-src::client.c29
1 files changed, 0 insertions, 29 deletions
diff --git a/security/stunnel/files/patch-src::client.c b/security/stunnel/files/patch-src::client.c
deleted file mode 100644
index ff6956a35df0..000000000000
--- a/security/stunnel/files/patch-src::client.c
+++ /dev/null
@@ -1,29 +0,0 @@
-Description: Allow transparent proxying using IP_BINDANY.
-Forwarded: yes
-Author: Peter Pentchev <roam@FreeBSD.org>,
- Jason Helfman <jhelfman@experts-exchange.com>
-Last-Updated: 2011-01-04
-
---- src/client.c.orig
-+++ src/client.c
-@@ -1034,15 +1034,16 @@
- static void local_bind(CLI *c) {
- SOCKADDR_UNION addr;
-
--#ifdef IP_TRANSPARENT
-+#ifdef STUNNEL_TRANSPARENT
- int on=1;
- if(c->opt->option.transparent) {
-- if(setsockopt(c->fd, SOL_IP, IP_TRANSPARENT, &on, sizeof on))
-- sockerror("setsockopt IP_TRANSPARENT");
-+ if(setsockopt(c->fd, STUNNEL_TRANSPARENT_LEVEL,
-+ STUNNEL_TRANSPARENT, &on, sizeof on))
-+ sockerror("setsockopt " STUNNEL_TRANSPARENT_NAME);
- /* ignore the error to retain Linux 2.2 compatibility */
- /* the error will be handled by bind(), anyway */
- }
--#endif /* IP_TRANSPARENT */
-+#endif /* STUNNEL_TRANSPARENT */
-
- memcpy(&addr, &c->bind_addr.addr[0], sizeof addr);
- if(ntohs(addr.in.sin_port)>=1024) { /* security check */