Mailinglist Archive: yast-commit (535 mails)

< Previous Next >
[yast-commit] r41299 - in /trunk/network: VERSION package/yast2-network.changes src/modules/Proxy.ycp
  • From: kmachalkova@xxxxxxxxxxxxxxxx
  • Date: Wed, 10 Oct 2007 08:41:59 -0000
  • Message-id: <20071010084159.B475E17463@xxxxxxxxxxxxxxxx>
Author: kmachalkova
Date: Wed Oct 10 10:41:59 2007
New Revision: 41299

URL: http://svn.opensuse.org/viewcvs/yast?rev=41299&view=rev
Log:
Escape backslashes in username also in .curlrc (#331038)

Modified:
    trunk/network/VERSION
    trunk/network/package/yast2-network.changes
    trunk/network/src/modules/Proxy.ycp

Modified: trunk/network/VERSION
URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=41299&r1=41298&r2=41299&view=diff
==============================================================================
--- trunk/network/VERSION (original)
+++ trunk/network/VERSION Wed Oct 10 10:41:59 2007
@@ -1 +1 @@
-2.16.1
+2.16.2

Modified: trunk/network/package/yast2-network.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.changes?rev=41299&r1=41298&r2=41299&view=diff
==============================================================================
--- trunk/network/package/yast2-network.changes (original)
+++ trunk/network/package/yast2-network.changes Wed Oct 10 10:41:59 2007
@@ -1,4 +1,10 @@
 -------------------------------------------------------------------
+Wed Oct 10 10:39:47 CEST 2007 - kmachalkova@xxxxxxx
+
+- Escape backslashes in usernames also in .curlrc (#331038)
+- 2.16.2
+
+-------------------------------------------------------------------
 Wed Oct  3 09:57:51 CEST 2007 - mvidner@xxxxxxx
 
 - Do not try to package COPYRIGHT.english, it is gone from

Modified: trunk/network/src/modules/Proxy.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/Proxy.ycp?rev=41299&r1=41298&r2=41299&view=diff
==============================================================================
--- trunk/network/src/modules/Proxy.ycp (original)
+++ trunk/network/src/modules/Proxy.ycp Wed Oct 10 10:41:59 2007
@@ -79,8 +79,14 @@
        pass = regexpsub(user, "^.*:(.*)$", "\\1");
        user = regexpsub(user, "^(.*):.*$", "\\1");
     }
+
     if(pass == nil) pass = "";
-    if(user == nil) user = "";
+    if(user == nil) 
+       user = "";
+    else {
+       if ( regexpmatch(user, "^.*\\\\.*$"))
+           user = regexpsub(user, "^(.*)\\\\(.*)$", "\\1\\2");
+    }
 
     /* Read /root/.wgetrc */
     /* YOU uses curl(1)
@@ -132,6 +138,8 @@
        /* Update /root/.curlrc */
        string proxyuser = nil;
        if (user != "") {
+           //Escape backslash characters in .curlrc (#331038)
+            user = mergestring (splitstring(user, "\\"), "\\\\");
            proxyuser = user;
            if (pass != "") proxyuser = user + ":" + pass;
        }

--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages