[Pkg-samba-maint] r1681 - trunk/samba/debian

[vorlon at alioth.debian.org]

Author: vorlon
Date: 2007-12-25 17:31:05 +0000 (Tue, 25 Dec 2007)
New Revision: 1681

Modified:
   trunk/samba/debian/changelog
   trunk/samba/debian/mount.smbfs
Log:
* Make the mount.smbfs wrapper a bash script instead of a POSIX sh script,
  so we can use bash array variables and cope with arguments containing
  embedded spaces (such as share names).  Thanks to Julian Gilbey
  <jdg at debian.org> for the patch.  Closes: #457105.

Modified: trunk/samba/debian/changelog
===================================================================
--- trunk/samba/debian/changelog	2007-12-14 15:44:47 UTC (rev 1680)
+++ trunk/samba/debian/changelog	2007-12-25 17:31:05 UTC (rev 1681)
@@ -2,8 +2,12 @@
 
   * Drop some further code in samba-common.postinst that's specific to
     pre-3.0 upgrades.
+  * Make the mount.smbfs wrapper a bash script instead of a POSIX sh script,
+    so we can use bash array variables and cope with arguments containing
+    embedded spaces (such as share names).  Thanks to Julian Gilbey
+    <jdg at debian.org> for the patch.  Closes: #457105.
 
- -- Steve Langasek <vorlon at debian.org>  Thu, 13 Dec 2007 02:21:32 -0800
+ -- Steve Langasek <vorlon at debian.org>  Tue, 25 Dec 2007 09:27:25 -0800
 
 samba (3.0.28-1) unstable; urgency=high
 

Modified: trunk/samba/debian/mount.smbfs
===================================================================
--- trunk/samba/debian/mount.smbfs	2007-12-14 15:44:47 UTC (rev 1680)
+++ trunk/samba/debian/mount.smbfs	2007-12-25 17:31:05 UTC (rev 1681)
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # Debian mount.smbfs compatibility wrapper
 # Copyright 2007, Steve Langasek <vorlon at debian.org>
 # Licensed under the GNU General Public License, version 2.  See the
@@ -83,7 +83,7 @@
 	echo $options
 }
 
-args=""
+args=()
 while [ "$#" -gt 0 ]; do
 	case "$1" in
 	-o*)
@@ -95,11 +95,11 @@
 		fi
 		arg="$(parse_mount_options "$arg")"
 		if [ -n "$arg" ]; then
-			args="$args -o $arg"
+			args=("${args[@]}" "-o" "$arg")
 		fi
 		;;
 	*)
-		args="$args $1"
+		args=("${args[@]}" "$1")
 		shift
 		;;
 	esac
@@ -107,4 +107,4 @@
 
 USER="$(reverse_username_workgroup "$USER")"
 
-exec /sbin/mount.cifs $args
+exec /sbin/mount.cifs "${args[@]}"