summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2011-09-07 17:22:49 +1000
committerAndrew Bartlett <abartlet@samba.org>2011-09-13 15:38:35 +1000
commit94886797bc6fdbf9adad221ae79021232ec03278 (patch)
tree511c149defcad5bca8f1f04ac858a7168ce2fa96
parent588c50f11e42bf6d21d1d213302001d178533f66 (diff)
downloadsamba-94886797bc6fdbf9adad221ae79021232ec03278.tar.gz
samba-94886797bc6fdbf9adad221ae79021232ec03278.tar.bz2
samba-94886797bc6fdbf9adad221ae79021232ec03278.zip
s4-subdomain: match windows form for trustAuthInOutBlob
Windows does not put a version element in the array Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
-rw-r--r--source4/scripting/python/samba/join.py14
1 files changed, 3 insertions, 11 deletions
diff --git a/source4/scripting/python/samba/join.py b/source4/scripting/python/samba/join.py
index eb31ea9767..ccb9f06f28 100644
--- a/source4/scripting/python/samba/join.py
+++ b/source4/scripting/python/samba/join.py
@@ -721,21 +721,13 @@ class dc_join(object):
clear_value.password = password_blob
clear_authentication_information = drsblobs.AuthenticationInformation()
- clear_authentication_information.LastUpdateTime = 0
+ clear_authentication_information.LastUpdateTime = samba.unix2nttime(int(time.time()))
clear_authentication_information.AuthType = lsa.TRUST_AUTH_TYPE_CLEAR
clear_authentication_information.AuthInfo = clear_value
- version_value = drsblobs.AuthInfoVersion()
- version_value.version = 1
-
- version = drsblobs.AuthenticationInformation()
- version.LastUpdateTime = 0
- version.AuthType = lsa.TRUST_AUTH_TYPE_VERSION
- version.AuthInfo = version_value
-
authentication_information_array = drsblobs.AuthenticationInformationArray()
- authentication_information_array.count = 2
- authentication_information_array.array = [clear_authentication_information, version]
+ authentication_information_array.count = 1
+ authentication_information_array.array = [clear_authentication_information]
outgoing = drsblobs.trustAuthInOutBlob()
outgoing.count = 1