* net/tramp-smb.el (tramp-smb-conf): New defcustom.

(tramp-smb-maybe-open-connection): Use it.

2 files changed, 15 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 65e171c1381..a1871e59677 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/lisp/net/tramp-smb.el b/lisp/net/tramp-smb.el
index 9d176a1fd3c..e9051f0a435 100644
--- a/lisp/net/tramp-smb.el
+++ b/lisp/net/tramp-smb.el
@@ -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 @@ connection if a previous connection has died for some reason."
 
           (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