[ooo-build-commit] patches/dev300

[Tor Lillqvist]

 patches/dev300/apply                         |    2 ++
 patches/dev300/gnome-vfs-authentication.diff |   23 +++++++++++++++++++++++
 2 files changed, 25 insertions(+)

New commits:
commit e2f0813337b4f79568197cf76ca65a6fb9b1f445
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Fri Dec 11 16:31:45 2009 +0200

    Set username/domain/password to use only if provided by user
    
    Apparently the semantics of ucbhelper::InteractionSupplyAuthentication
    has changed, the getUserName(), getRealm() and getPassword() methods
    now return non-empty strings only if the user interaction actually
    changed them!? So check the return values for being non-empty before
    using them for gnome-vfs authentication. Fixes bnc#465102.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index c7cba4e..925cbd8 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -605,6 +605,8 @@ gnome-vfs-locking-config_office.diff, i#91151, jholesov
 
 gnome-vfs-locking-ucb.diff, i#91151, jholesov
 
+gnome-vfs-authentication.diff, bnc#465102, tml
+
 # Move gnome-vfs out of the startup sequence, load it only when needed
 # (up-stream does not like it, because it adds dependency to VCL in URE)
 gnome-vfs-late-init.diff, i#84137, jholesov
diff --git a/patches/dev300/gnome-vfs-authentication.diff b/patches/dev300/gnome-vfs-authentication.diff
new file mode 100644
index 0000000..eab2517
--- /dev/null
+++ b/patches/dev300/gnome-vfs-authentication.diff
@@ -0,0 +1,23 @@
+--- ucb/source/ucp/gvfs/content.cxx.old	2009-12-07 17:53:02.000000000 +0200
++++ ucb/source/ucp/gvfs/content.cxx	2009-12-11 18:21:42.000000000 +0200
+@@ -1719,9 +1719,17 @@
+                     ucbhelper::InteractionSupplyAuthentication > & xSupp
+                     = xRequest->getAuthenticationSupplier();
+ 
+-                aUserName = xSupp->getUserName();
+-                aDomain   = xSupp->getRealm();
+-                aPassword = xSupp->getPassword();
++		::rtl::OUString aNewDomain, aNewUserName, aNewPassword;
++
++                aNewUserName = xSupp->getUserName();
++		if (aNewUserName.getLength())
++		    aUserName = aNewUserName;
++                aNewDomain   = xSupp->getRealm();
++		if (aNewDomain.getLength())
++		    aDomain = aNewDomain;
++                aNewPassword = xSupp->getPassword();
++		if (aNewPassword.getLength())
++		    aPassword = aNewPassword;
+ 
+                 {
+                     osl::Guard< osl::Mutex > aGuard( osl::Mutex::getGlobalMutex() );