diff options
| author | Adam Misnyovszki <amisnyov@redhat.com> | 2014-05-05 19:21:01 +0200 |
|---|---|---|
| committer | Alexander Bokovoy <abokovoy@redhat.com> | 2014-05-06 19:14:45 +0300 |
| commit | fa7057b72723a7999dffc1de9bdf97d13f12079c (patch) | |
| tree | 7d86c7a639503535a2af98185327313841342d44 /ipaserver/dcerpc.py | |
| parent | 2c08a16f8f52927332bd5fde31bc855b2d657afc (diff) | |
| download | freeipa-fa7057b72723a7999dffc1de9bdf97d13f12079c.tar.gz freeipa-fa7057b72723a7999dffc1de9bdf97d13f12079c.tar.xz freeipa-fa7057b72723a7999dffc1de9bdf97d13f12079c.zip | |
Trust add datetime fix
Fixes trust add, since now datetime object is returned
for 'modifytimestamp', which cannot be split like a string.
Reviewed-By: Nathaniel McCallum <npmccallum@redhat.com>
Diffstat (limited to 'ipaserver/dcerpc.py')
| -rw-r--r-- | ipaserver/dcerpc.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ipaserver/dcerpc.py b/ipaserver/dcerpc.py index 3b89adc08..312761662 100644 --- a/ipaserver/dcerpc.py +++ b/ipaserver/dcerpc.py @@ -1107,7 +1107,7 @@ class TrustDomainJoins(object): # Use realmdomains' modification timestamp to judge records last update time entry = self.api.Backend.ldap2.get_entry(realm_domains['dn'], ['modifyTimestamp']) # Convert the timestamp to Windows 64-bit timestamp format - trust_timestamp = long(time.mktime(time.strptime(entry['modifytimestamp'][0][:14], "%Y%m%d%H%M%S"))*1e7+116444736000000000) + trust_timestamp = long(time.mktime(entry['modifytimestamp'][0].timetuple())*1e7+116444736000000000) for dom in realm_domains['associateddomain']: ftinfo = dict() |