Author: mzugec Date: Fri Aug 6 14:21:52 2010 New Revision: 62366 URL: http://svn.opensuse.org/viewcvs/yast?rev=62366&view=rev Log: Proxy: correctly enclose user:password into quotes (bnc#616695) Modified: branches/SuSE-Code-11-SP1-Branch/network/VERSION branches/SuSE-Code-11-SP1-Branch/network/package/yast2-network.changes branches/SuSE-Code-11-SP1-Branch/network/src/modules/Proxy.ycp Modified: branches/SuSE-Code-11-SP1-Branch/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/network/VERSION?rev=62366&r1=62365&r2=62366&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/network/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/network/VERSION Fri Aug 6 14:21:52 2010 @@ -1 +1 @@ -2.17.140 +2.17.141 Modified: branches/SuSE-Code-11-SP1-Branch/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/network/package/yast2-network.changes?rev=62366&r1=62365&r2=62366&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/network/package/yast2-network.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/network/package/yast2-network.changes Fri Aug 6 14:21:52 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Aug 6 14:20:40 CEST 2010 - mzugec@suse.de + +- Proxy: correctly enclose user:password into quotes (bnc#616695) +- 2.17.141 + +------------------------------------------------------------------- Mon Aug 2 14:01:45 CEST 2010 - mzugec@suse.de - YaPI: static hostname with DHCP (bnc#624655) Modified: branches/SuSE-Code-11-SP1-Branch/network/src/modules/Proxy.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/network/src/modules/Proxy.ycp?rev=62366&r1=62365&r2=62366&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/network/src/modules/Proxy.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/network/src/modules/Proxy.ycp Fri Aug 6 14:21:52 2010 @@ -257,10 +257,10 @@ proxy_password = mergestring (splitstring(proxy_password, "\""), "\\\""); string user_pass = (proxy_user != "" ? - " --proxy-user " + proxy_user + (proxy_password != "" ? + " --proxy-user '" + proxy_user + (proxy_password != "" ? ":" + proxy_password : - "") + "") + "'" : ""); @@ -268,7 +268,7 @@ integer timeout_sec = 90; // %1 = http or ftp proxy, %2 = user:password if any, %3 = URL // enclose user:password into quotes, it may contain special characters (#338264) - string command = "curl --verbose --proxy %1 '%2' --connect-timeout %3 --url %4"; + string command = "curl --verbose --proxy %1 %2 --connect-timeout %3 --url %4"; string http_command = sformat(command, http_proxy, user_pass, timeout_sec, "http://www.novell.com"); // adding option --insecure to accept the certificate without asking string https_command = sformat(command, https_proxy, user_pass, timeout_sec, "https://secure-www.novell.com --insecure"); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org