# HG changeset patch
# User Michael Albinus <michael.albinus@gmx.de>
# Date 1264244548 -3600
# Node ID 5071660bbec4fe50a3cfdaba04fd54d8cb294955
# Parent  9a7965a5cdaf74a1eb391885c7df46b98f80fc1d
* net/tramp-smb.el (tramp-smb-conf): New defcustom.
(tramp-smb-maybe-open-connection): Use it.

diff -r 9a7965a5cdaf -r 5071660bbec4 lisp/ChangeLog
--- a/lisp/ChangeLog	Sat Jan 23 14:20:38 2010 +0900
+++ b/lisp/ChangeLog	Sat Jan 23 12:02:28 2010 +0100
@@ -1,6 +1,11 @@
+2010-01-23  Michael Albinus  <michael.albinus@gmx.de>
+
+	* net/tramp-smb.el (tramp-smb-conf): New defcustom.
+	(tramp-smb-maybe-open-connection): Use it.
+
 2010-01-22  Michael Albinus  <michael.albinus@gmx.de>
 
-	* net/tramp-imap.el (top): Autoload needed packages.
+	* net/tramp-imap.el (top): Autoload needed packages.  (Bug#5448)
 
 2010-01-22  Stefan Monnier  <monnier@iro.umontreal.ca>
 
diff -r 9a7965a5cdaf -r 5071660bbec4 lisp/net/tramp-smb.el
--- a/lisp/net/tramp-smb.el	Sat Jan 23 14:20:38 2010 +0900
+++ b/lisp/net/tramp-smb.el	Sat Jan 23 12:02:28 2010 +0100
@@ -61,6 +61,13 @@
   :group 'tramp
   :type 'string)
 
+(defcustom tramp-smb-conf "/dev/null"
+  "*Path of the smb.conf file.
+If it is nil, no smb.conf will be added to the `tramp-smb-program'
+call, letting the SMB client use the default one."
+  :group 'tramp
+  :type '(choice (const nil) (file :must-match t)))
+
 (defvar tramp-smb-version nil
   "*Version string of the SMB client.")
 
@@ -1281,7 +1288,8 @@
 
 	  (when domain (setq args (append args (list "-W" domain))))
 	  (when port   (setq args (append args (list "-p" port))))
-	  (setq args (append args (list "-s" "/dev/null")))
+	  (when tramp-smb-conf
+	    (setq args (append args (list "-s" tramp-smb-conf))))
 
 	  ;; OK, let's go.
 	  (tramp-message