From 94886797bc6fdbf9adad221ae79021232ec03278 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 7 Sep 2011 17:22:49 +1000 Subject: s4-subdomain: match windows form for trustAuthInOutBlob Windows does not put a version element in the array Pair-Programmed-With: Andrew Bartlett --- source4/scripting/python/samba/join.py | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'source4/scripting') 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 -- cgit