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
commitef781ddc063bbd1d7a181c3c76d0aa0c4a757ff3 (patch)
tree13e589ed2ee329f2a4b6e81bc0a5522596df7c5f
parent2812242df4fefcb6567dc3a117b5e55a3211de92 (diff)
downloadfreeipa-ef781ddc063bbd1d7a181c3c76d0aa0c4a757ff3.tar.gz
freeipa-ef781ddc063bbd1d7a181c3c76d0aa0c4a757ff3.tar.xz
freeipa-ef781ddc063bbd1d7a181c3c76d0aa0c4a757ff3.zip
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 7b8eeb002..8849e529b 100644
--- a/ipaserver/dcerpc.py
+++ b/ipaserver/dcerpc.py
@@ -854,8 +854,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):