s4-subdomain: match windows form for trustAuthInOutBlob
authorAndrew Tridgell <tridge@samba.org>
Wed, 7 Sep 2011 07:22:49 +0000 (17:22 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Tue, 13 Sep 2011 05:38:35 +0000 (15:38 +1000)
Windows does not put a version element in the array

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>

source4/scripting/python/samba/join.py

index eb31ea9767ae17fc6f1a36f863a787081facab0b..ccb9f06f285474b4252aa5ce2a09ce3367c7194f 100644 (file)
@@ -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