summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Bokovoy <abokovoy@redhat.com>2015-08-05 21:33:45 +0300
committerTomas Babej <tbabej@redhat.com>2015-08-07 17:55:48 +0200
commitee377a20cd842f03ff263e21b00267732a9fe3dc (patch)
treefdac8d9e2e82e076793d252e6017d5b5dc3c4053
parent7688bbcc33eb24a86ede7dc12ea9c64a27006aa8 (diff)
downloadfreeipa-ee377a20cd842f03ff263e21b00267732a9fe3dc.zip
freeipa-ee377a20cd842f03ff263e21b00267732a9fe3dc.tar.gz
freeipa-ee377a20cd842f03ff263e21b00267732a9fe3dc.tar.xz
Fix selector of protocol for LSA RPC binding string
For Windows Server 2012R2 and others which force SMB2 protocol use we have to specify right DCE RPC binding options. For using SMB1 protocol we have to omit specifying SMB2 protocol and anything else or otherwise SMB1 would be considered a pipe to connect to. This is by design of a binding string format. https://fedorahosted.org/freeipa/ticket/5183 Reviewed-By: Tomas Babej <tbabej@redhat.com>
-rw-r--r--ipaserver/dcerpc.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/ipaserver/dcerpc.py b/ipaserver/dcerpc.py
index 87f043f..5f04d95 100644
--- a/ipaserver/dcerpc.py
+++ b/ipaserver/dcerpc.py
@@ -864,8 +864,8 @@ class TrustDomainInstance(object):
We try NCACN_NP before NCACN_IP_TCP and use SMB2 before SMB1 or defaults.
"""
transports = (u'ncacn_np', u'ncacn_ip_tcp')
- options = ( u'smb2', u'smb1', u'')
- binding_template=lambda x,y,z: u'%s:%s[%s,print]' % (x, y, z)
+ options = ( u'smb2,print', u'print')
+ binding_template=lambda x,y,z: u'%s:%s[%s]' % (x, y, z)
return [binding_template(t, remote_host, o) for t in transports for o in options]
def retrieve_anonymously(self, remote_host, discover_srv=False, search_pdc=False):