summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2011-08-05 11:17:06 +1000
committerAndrew Bartlett <abartlet@samba.org>2011-08-09 11:56:23 +0200
commitd994ef20567c1368f6bdea163d12ed3837f79a03 (patch)
tree9ad157c75c4db4965558d1b79fa680eb163c6ada
parent68d79eb6efb32eb3bc416ffc3430f0e4b1eed691 (diff)
downloadsamba-d994ef20567c1368f6bdea163d12ed3837f79a03.tar.gz
samba-d994ef20567c1368f6bdea163d12ed3837f79a03.tar.bz2
samba-d994ef20567c1368f6bdea163d12ed3837f79a03.zip
pysamdb: move normalise_int32() to common module
this will be needed in quite a few places
-rw-r--r--source4/scripting/python/samba/common.py5
-rw-r--r--source4/scripting/python/samba/samdb.py9
2 files changed, 7 insertions, 7 deletions
diff --git a/source4/scripting/python/samba/common.py b/source4/scripting/python/samba/common.py
index 6eeace5943..867f44a116 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 8a12c9746a..46a7fea32e 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)