r26061 - in /desktop/unstable/gvfs/debian: changelog patches/07_smb_initialdir.patch patches/series

[joss at users.alioth.debian.org]

Author: joss
Date: Tue Dec 21 18:48:55 2010
New Revision: 26061

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=26061
Log:
07_smb_initialdir.patch: new patch by Tomas Bzatek and myself. Take 
into account initial path when doing a SMB mount, to avoid 
permission issues. Closes: #533417.

Added:
    desktop/unstable/gvfs/debian/patches/07_smb_initialdir.patch
Modified:
    desktop/unstable/gvfs/debian/changelog
    desktop/unstable/gvfs/debian/patches/series

Modified: desktop/unstable/gvfs/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gvfs/debian/changelog?rev=26061&op=diff
==============================================================================
--- desktop/unstable/gvfs/debian/changelog [utf-8] (original)
+++ desktop/unstable/gvfs/debian/changelog [utf-8] Tue Dec 21 18:48:55 2010
@@ -1,3 +1,11 @@
+gvfs (1.6.4-3) UNRELEASED; urgency=low
+
+  * 07_smb_initialdir.patch: new patch by Tomas Bzatek and myself. Take 
+    into account initial path when doing a SMB mount, to avoid 
+    permission issues. Closes: #533417.
+
+ -- Josselin Mouette <joss at debian.org>  Fri, 17 Dec 2010 18:01:11 +0100
+
 gvfs (1.6.4-2) unstable; urgency=low
 
   * 06_sftp_timeout.patch: patch from Andreas Henriksson to fix 

Added: desktop/unstable/gvfs/debian/patches/07_smb_initialdir.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gvfs/debian/patches/07_smb_initialdir.patch?rev=26061&op=file
==============================================================================
--- desktop/unstable/gvfs/debian/patches/07_smb_initialdir.patch (added)
+++ desktop/unstable/gvfs/debian/patches/07_smb_initialdir.patch [utf-8] Tue Dec 21 18:48:55 2010
@@ -1,0 +1,52 @@
+Index: gvfs-1.6.4/daemon/gvfsbackendsmb.c
+===================================================================
+--- gvfs-1.6.4.orig/daemon/gvfsbackendsmb.c	2010-12-17 17:58:05.000000000 +0100
++++ gvfs-1.6.4/daemon/gvfsbackendsmb.c	2010-12-21 19:39:35.000000000 +0100
+@@ -68,6 +68,7 @@
+   char *share;
+   char *user;
+   char *domain;
++  char *path;
+   
+   SMBCCTX *smb_context;
+ 
+@@ -579,7 +580,7 @@
+   g_vfs_backend_set_mount_spec (backend, smb_mount_spec);
+   g_mount_spec_unref (smb_mount_spec);
+ 
+-  uri = create_smb_uri (op_backend->server, op_backend->share, NULL);
++  uri = create_smb_uri (op_backend->server, op_backend->share, op_backend->path);
+ 
+ 
+   /*  Samba mount loop  */
+@@ -636,6 +637,7 @@
+ 
+   /* Mount was successful */
+ 
++  g_vfs_backend_set_default_location (backend, op_backend->path);
+   g_vfs_keyring_save_password (op_backend->last_user,
+ 			       op_backend->server,
+ 			       op_backend->last_domain,
+@@ -657,7 +659,7 @@
+ 	   gboolean is_automount)
+ {
+   GVfsBackendSmb *op_backend = G_VFS_BACKEND_SMB (backend);
+-  const char *server, *share, *user, *domain;
++  const char *server, *share, *user, *domain, *path;
+ 
+   server = g_mount_spec_get (mount_spec, "server");
+   share = g_mount_spec_get (mount_spec, "share");
+@@ -672,11 +674,13 @@
+ 
+   user = g_mount_spec_get (mount_spec, "user");
+   domain = g_mount_spec_get (mount_spec, "domain");
++  path = mount_spec->mount_prefix;
+   
+   op_backend->server = g_strdup (server);
+   op_backend->share = g_strdup (share);
+   op_backend->user = g_strdup (user);
+   op_backend->domain = g_strdup (domain);
++  op_backend->path = g_strdup (path);
+   
+   return FALSE;
+ }

Modified: desktop/unstable/gvfs/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gvfs/debian/patches/series?rev=26061&op=diff
==============================================================================
--- desktop/unstable/gvfs/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gvfs/debian/patches/series [utf-8] Tue Dec 21 18:48:55 2010
@@ -4,5 +4,6 @@
 04_hurd_path_max.patch
 05_shared_libdaemon.patch
 06_sftp_timeout.patch
+07_smb_initialdir.patch
 90_relibtoolize.patch
 99_ltmain_as-needed.patch