[debian-edu-commits] r79815 - in branches/wheezy/debian-edu-config: debian share/debian-edu-config/tools

[pere at alioth.debian.org]

Author: pere
Date: 2013-04-27 18:16:22 +0000 (Sat, 27 Apr 2013)
New Revision: 79815

Modified:
   branches/wheezy/debian-edu-config/debian/changelog
   branches/wheezy/debian-edu-config/share/debian-edu-config/tools/wpad-extract
Log:
Adjust wpad-extract to only accept http and https URLs from the
proxy tool, to avoid direct:// style URLs that are useless as values
of http_proxy and ftp_proxy.

Modified: branches/wheezy/debian-edu-config/debian/changelog
===================================================================
--- branches/wheezy/debian-edu-config/debian/changelog	2013-04-27 05:13:21 UTC (rev 79814)
+++ branches/wheezy/debian-edu-config/debian/changelog	2013-04-27 18:16:22 UTC (rev 79815)
@@ -1,3 +1,11 @@
+debian-edu-config (1.704~svn79805) UNRELEASED; urgency=low
+
+  * Adjust wpad-extract to only accept http and https URLs from the
+    proxy tool, to avoid direct:// style URLs that are useless as values
+    of http_proxy and ftp_proxy.
+
+ -- Petter Reinholdtsen <pere at debian.org>  Sat, 27 Apr 2013 20:15:38 +0200
+
 debian-edu-config (1.704~svn79804) wheezy-test; urgency=low
 
   [ Wolfgang Schweer ]

Modified: branches/wheezy/debian-edu-config/share/debian-edu-config/tools/wpad-extract
===================================================================
--- branches/wheezy/debian-edu-config/share/debian-edu-config/tools/wpad-extract	2013-04-27 05:13:21 UTC (rev 79814)
+++ branches/wheezy/debian-edu-config/share/debian-edu-config/tools/wpad-extract	2013-04-27 18:16:22 UTC (rev 79815)
@@ -12,4 +12,11 @@
 # proxy URL and thus is much shorter then its predecessor.
 
 proxy_url=$(echo http://www.debian.org | proxy 2>/dev/null | cut -d" " -f1)
-echo http_proxy=$proxy_url
+
+# make sure direct:// urls do not make it through to the system config
+case "$proxy_url" in
+    http:*|https:*)
+	echo http_proxy=$proxy_url
+	;;
+esac
+