comparison 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
comparison
equal deleted inserted replaced
106956:9a7965a5cdaf 106959:5071660bbec4
58 58
59 (defcustom tramp-smb-program "smbclient" 59 (defcustom tramp-smb-program "smbclient"
60 "*Name of SMB client to run." 60 "*Name of SMB client to run."
61 :group 'tramp 61 :group 'tramp
62 :type 'string) 62 :type 'string)
63
64 (defcustom tramp-smb-conf "/dev/null"
65 "*Path of the smb.conf file.
66 If it is nil, no smb.conf will be added to the `tramp-smb-program'
67 call, letting the SMB client use the default one."
68 :group 'tramp
69 :type '(choice (const nil) (file :must-match t)))
63 70
64 (defvar tramp-smb-version nil 71 (defvar tramp-smb-version nil
65 "*Version string of the SMB client.") 72 "*Version string of the SMB client.")
66 73
67 (defconst tramp-smb-prompt "^smb: .+> \\|^\\s-+Server\\s-+Comment$" 74 (defconst tramp-smb-prompt "^smb: .+> \\|^\\s-+Server\\s-+Comment$"
1279 (setq args (append args (list "-U" real-user))) 1286 (setq args (append args (list "-U" real-user)))
1280 (setq args (append args (list "-N")))) 1287 (setq args (append args (list "-N"))))
1281 1288
1282 (when domain (setq args (append args (list "-W" domain)))) 1289 (when domain (setq args (append args (list "-W" domain))))
1283 (when port (setq args (append args (list "-p" port)))) 1290 (when port (setq args (append args (list "-p" port))))
1284 (setq args (append args (list "-s" "/dev/null"))) 1291 (when tramp-smb-conf
1292 (setq args (append args (list "-s" tramp-smb-conf))))
1285 1293
1286 ;; OK, let's go. 1294 ;; OK, let's go.
1287 (tramp-message 1295 (tramp-message
1288 vec 3 "Opening connection for //%s%s/%s..." 1296 vec 3 "Opening connection for //%s%s/%s..."
1289 (if (not (zerop (length user))) (concat user "@") "") 1297 (if (not (zerop (length user))) (concat user "@") "")