Mercurial > emacs
diff lisp/net/tramp-smb.el @ 106959:5071660bbec4
* net/tramp-smb.el (tramp-smb-conf): New defcustom.
(tramp-smb-maybe-open-connection): Use it.
author | Michael Albinus <michael.albinus@gmx.de> |
---|---|
date | Sat, 23 Jan 2010 12:02:28 +0100 |
parents | 1d1d5d9bd884 |
children | d7831d04952b |
line wrap: on
line diff
--- 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