diff options
| -rwxr-xr-x | source4/scripting/bin/fullschema | 3 | ||||
| -rwxr-xr-x | source4/scripting/bin/get-descriptors | 7 | ||||
| -rwxr-xr-x | source4/scripting/python/samba/upgradehelpers.py | 4 |
3 files changed, 5 insertions, 9 deletions
diff --git a/source4/scripting/bin/fullschema b/source4/scripting/bin/fullschema index 2f7d32c075..2987136a40 100755 --- a/source4/scripting/bin/fullschema +++ b/source4/scripting/bin/fullschema @@ -5,7 +5,6 @@ import base64 import optparse -import os import sys # Find right directory when running from source tree @@ -13,7 +12,7 @@ sys.path.insert(0, "bin/python") import samba from samba import getopt as options, Ldb -from ldb import SCOPE_SUBTREE, SCOPE_BASE, LdbError +from ldb import SCOPE_SUBTREE, SCOPE_BASE import sys parser = optparse.OptionParser("fullschema <URL>") diff --git a/source4/scripting/bin/get-descriptors b/source4/scripting/bin/get-descriptors index 65be2fee6c..73295b0c38 100755 --- a/source4/scripting/bin/get-descriptors +++ b/source4/scripting/bin/get-descriptors @@ -27,24 +27,20 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # -import getopt import optparse import sys -import os import base64 -import re sys.path.insert(0, "bin/python") import samba from samba.auth import system_session import samba.getopt as options -from samba import param from samba.ndr import ndr_pack, ndr_unpack from samba.dcerpc import security from samba import Ldb from samba.samdb import SamDB -from ldb import SCOPE_SUBTREE, SCOPE_ONELEVEL, SCOPE_BASE, LdbError +from ldb import SCOPE_SUBTREE, SCOPE_BASE parser = optparse.OptionParser("get-descriptor [options]") sambaopts = options.SambaOptions(parser) @@ -65,6 +61,7 @@ creds = credopts.get_credentials(lp) opts = parser.parse_args()[0] class DescrGetter: + def __init__(self, localdomain, remotedomain): self.samdb = SamDB(session_info=system_session(), lp=lp, options=["modules:paged_searches"]) self.remote_ldb= Ldb("ldap://" + opts.host + ":389", credentials=creds, lp=lp, diff --git a/source4/scripting/python/samba/upgradehelpers.py b/source4/scripting/python/samba/upgradehelpers.py index 7c6afaec5b..58907458ed 100755 --- a/source4/scripting/python/samba/upgradehelpers.py +++ b/source4/scripting/python/samba/upgradehelpers.py @@ -506,8 +506,8 @@ def get_diff_sddls(refsddl, cursddl): for elem in c_ref["aces"]: h_ref.add(elem) - for k in h_ref: - if h_new.has_key(k): + for k in set(h_ref): + if k in h_new: h_new.remove(k) h_ref.remove(k) |