From ead0f653f9f44484b6fb8eb458538adbe0c7bebc Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Sun, 22 Jun 2014 09:14:35 +0200
Subject: Rename patches to match our naming scheme:

  + 008_nxcomp_sa-restorer.full+lite.patch
  + 009_nxagent_add-man-page.full.patch
  + 009_nxproxy_add-man-page.full+lite.patch
  + 056_nx-X11_Werror-format-security.full.patch
  + 209_x2goagent_add-man-page.full.patch
  + 220_nxproxy_bind-loopback-only.full+lite.patch
---
 .../220_nxproxy-bind-loopback-only.full+lite.patch | 130 ---------------------
 1 file changed, 130 deletions(-)
 delete mode 100644 debian/patches/220_nxproxy-bind-loopback-only.full+lite.patch

(limited to 'debian/patches/220_nxproxy-bind-loopback-only.full+lite.patch')

diff --git a/debian/patches/220_nxproxy-bind-loopback-only.full+lite.patch b/debian/patches/220_nxproxy-bind-loopback-only.full+lite.patch
deleted file mode 100644
index fc268a55f..000000000
--- a/debian/patches/220_nxproxy-bind-loopback-only.full+lite.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-Description: Force NX proxy to bind to loopback devices only (loopback option)
-Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
---- a/nxcomp/Loop.cpp
-+++ b/nxcomp/Loop.cpp
-@@ -952,6 +952,7 @@
- static char displayHost[DEFAULT_STRING_LENGTH] = { 0 };
- static char authCookie[DEFAULT_STRING_LENGTH]  = { 0 };
- 
-+static int loopbackBind = DEFAULT_LOOPBACK_BIND;
- static int proxyPort = DEFAULT_NX_PROXY_PORT;
- static int xPort     = DEFAULT_NX_X_PORT;
- 
-@@ -3959,7 +3960,14 @@
- 
-   tcpAddr.sin_family = AF_INET;
-   tcpAddr.sin_port = htons(proxyPortTCP);
--  tcpAddr.sin_addr.s_addr = htonl(INADDR_ANY);
-+  if ( loopbackBind )
-+  {
-+    tcpAddr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
-+  }
-+  else
-+  {
-+    tcpAddr.sin_addr.s_addr = htonl(INADDR_ANY);
-+  }
- 
-   if (bind(tcpFD, (sockaddr *) &tcpAddr, sizeof(tcpAddr)) == -1)
-   {
-@@ -4550,7 +4558,14 @@
- 
-   tcpAddr.sin_family = AF_INET;
-   tcpAddr.sin_port = htons(portTCP);
--  tcpAddr.sin_addr.s_addr = htonl(INADDR_ANY);
-+  if ( loopbackBind )
-+  {
-+    tcpAddr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
-+  }
-+  else
-+  {
-+    tcpAddr.sin_addr.s_addr = htonl(INADDR_ANY);
-+  }
- 
-   if (bind(newFD, (sockaddr *) &tcpAddr, sizeof(tcpAddr)) == -1)
-   {
-@@ -6718,7 +6733,14 @@
- 
-   #ifdef __APPLE__
- 
--  tcpAddr.sin_addr.s_addr = htonl(INADDR_ANY);
-+  if ( loopbackBind )
-+  {
-+    tcpAddr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
-+  }
-+  else
-+  {
-+    tcpAddr.sin_addr.s_addr = htonl(INADDR_ANY);
-+  }
- 
-   #else
- 
-@@ -8397,6 +8419,10 @@
- 
-       listenPort = ValidateArg("local", name, value);
-     }
-+    else if (strcasecmp(name, "loopback") == 0)
-+    {
-+      loopbackBind = ValidateArg("local", name, value);
-+    }
-     else if (strcasecmp(name, "accept") == 0)
-     {
-       if (*connectHost != '\0')
-@@ -13773,7 +13799,14 @@
-     }
-     else
-     {
--      address = htonl(INADDR_ANY);
-+      if ( loopbackBind )
-+      {
-+        address = htonl(INADDR_LOOPBACK);
-+      }
-+      else
-+      {
-+        address = htonl(INADDR_ANY);
-+      }
-     }
-   }
-   else
---- a/nxcomp/Misc.cpp
-+++ b/nxcomp/Misc.cpp
-@@ -42,6 +42,14 @@
- #undef  DEBUG
- 
- //
-+// By default nxproxy binds to all network interfaces, setting
-+// DEFAULT_LOOPBACK_BIND to 1 enables binding to the loopback
-+// device only.
-+//
-+
-+const int DEFAULT_LOOPBACK_BIND = 0;
-+
-+//
- // TCP port offset applied to any NX port specification.
- //
- 
-@@ -137,6 +145,8 @@
- \n\
-   listen=n     Local port used for accepting the proxy connection.\n\
- \n\
-+  loopback=b   Bind to the loopback device only.\n\
-+\n\
-   accept=s     Name or IP of host that can connect to the proxy.\n\
- \n\
-   connect=s    Name or IP of host that the proxy will connect to.\n\
---- a/nxcomp/Misc.h
-+++ b/nxcomp/Misc.h
-@@ -90,6 +90,14 @@
- extern const int DEFAULT_NX_SLAVE_PORT_SERVER_OFFSET;
- 
- //
-+// NX proxy binds to all network interfaces by default
-+// With the -loopback parameter, you can switch
-+// over to binding to the loopback device only.
-+//
-+
-+extern const int DEFAULT_LOOPBACK_BIND;
-+
-+//
- // Return strings containing various info.
- //
- 
-- 
cgit v1.2.3