[Emacs-diffs] /srv/bzr/emacs/trunk r99398: * net/tramp-smb.el (tramp-smb-conf): New defcustom.

[Michael Albinus]

------------------------------------------------------------
revno: 99398
committer: Michael Albinus <address@hidden>
branch nick: trunk
timestamp: Sat 2010-01-23 12:02:28 +0100
message:
  * net/tramp-smb.el (tramp-smb-conf): New defcustom.
  (tramp-smb-maybe-open-connection): Use it.
modified:
  lisp/ChangeLog
  lisp/net/tramp-smb.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-01-22 21:17:11 +0000
+++ b/lisp/ChangeLog    2010-01-23 11:02:28 +0000
@@ -1,6 +1,11 @@
+2010-01-23  Michael Albinus  <address@hidden>
+
+       * net/tramp-smb.el (tramp-smb-conf): New defcustom.
+       (tramp-smb-maybe-open-connection): Use it.
+
 2010-01-22  Michael Albinus  <address@hidden>
 
-       * net/tramp-imap.el (top): Autoload needed packages.
+       * net/tramp-imap.el (top): Autoload needed packages.  (Bug#5448)
 
 2010-01-22  Stefan Monnier  <address@hidden>
 

=== modified file 'lisp/net/tramp-smb.el'
--- a/lisp/net/tramp-smb.el     2010-01-13 08:35:10 +0000
+++ b/lisp/net/tramp-smb.el     2010-01-23 11:02:28 +0000
@@ -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