From 00f4800ed3ca5dc9ce3b241099790e595390f8fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A5=D0=B8=D1=80=D0=B5=D1=86=D0=BA=D0=B8=D0=B9=20=D0=9C?= =?UTF-8?q?=D0=B8=D1=85=D0=B0=D0=B8=D0=BB?= Date: Wed, 14 Nov 2018 18:03:04 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=BE=20=D0=B8=D1=81=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7?= =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=BF=D0=B5=D1=80=D0=B5?= =?UTF-8?q?=D0=BC=D0=B5=D0=BD=D0=BD=D0=BE=D0=B9=20=D0=B2=D0=BC=D0=B5=D1=81?= =?UTF-8?q?=D1=82=D0=BE=20=D0=B0=D0=B2=D1=82=D0=BE=D0=BC=D0=B0=D1=82=D0=B8?= =?UTF-8?q?=D1=87=D0=B5=D1=81=D0=BA=D0=BE=D0=B3=D0=BE=20=D0=BE=D0=BF=D1=80?= =?UTF-8?q?=D0=B5=D0=B4=D0=B5=D0=BB=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=B4=D0=BE?= =?UTF-8?q?=D0=BC=D0=B5=D0=BD=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pym/client/client.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pym/client/client.py b/pym/client/client.py index 4601f39..4453a66 100644 --- a/pym/client/client.py +++ b/pym/client/client.py @@ -292,8 +292,7 @@ class Client(commandServer, encrypt, Desktop): else: nomapposix = ",nomapposix" cache_method = self.clVars.Get('cl_cifs_cache') - domain = self.clVars.Get('cl_remote_domain') or \ - self.get_server_domainname(host) + domain = self.get_server_domainname(host) if not uid is None: # mount by uid p = process(mountCmd, "-t", "cifs", "-o", @@ -312,6 +311,9 @@ class Client(commandServer, encrypt, Desktop): return p.success() def get_server_domainname(self, host): + vardomain = self.clVars.Get('cl_remote_domain') + if vardomain: + return vardomain if host not in self.domainnames: try: self.domainnames[host] = Samba().get_server_domainname(host)