From d994ef20567c1368f6bdea163d12ed3837f79a03 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Fri, 5 Aug 2011 11:17:06 +1000 Subject: [PATCH] pysamdb: move normalise_int32() to common module this will be needed in quite a few places --- source4/scripting/python/samba/common.py | 5 +++++ source4/scripting/python/samba/samdb.py | 9 ++------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/source4/scripting/python/samba/common.py b/source4/scripting/python/samba/common.py index 6eeace59435..867f44a1163 100644 --- a/source4/scripting/python/samba/common.py +++ b/source4/scripting/python/samba/common.py @@ -50,3 +50,8 @@ def confirm(msg, forced = False, allow_all=False): print("Unknown response '%s'" % v) +def normalise_int32(ivalue): + '''normalise a ldap integer to signed 32 bit''' + if int(ivalue) & 0x80000000: + return str(int(ivalue) - 0x100000000) + return str(ivalue) diff --git a/source4/scripting/python/samba/samdb.py b/source4/scripting/python/samba/samdb.py index 8a12c9746a7..46a7fea32e3 100644 --- a/source4/scripting/python/samba/samdb.py +++ b/source4/scripting/python/samba/samdb.py @@ -30,6 +30,7 @@ import base64 from samba import dsdb from samba.ndr import ndr_unpack, ndr_pack from samba.dcerpc import drsblobs, misc +from samba.common import normalise_int32 __docformat__ = "restructuredText" @@ -170,7 +171,7 @@ pwdLastSet: 0 "objectClass": "group"} if grouptype is not None: - ldbmessage["groupType"] = self.normalise_int32(grouptype) + ldbmessage["groupType"] = normalise_int32(grouptype) if description is not None: ldbmessage["description"] = description @@ -774,9 +775,3 @@ accountExpires: %u if sd: m["nTSecurityDescriptor"] = ndr_pack(sd) self.add(m) - - def normalise_int32(self, ivalue): - '''normalise a ldap integer to signed 32 bit''' - if int(ivalue) & 0x80000000: - return str(int(ivalue) - 0x100000000) - return str(ivalue) -- 2.34.1