summaryrefslogtreecommitdiffstats
path: root/source4/scripting/python/samba/join.py
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2011-11-04 17:34:47 +0100
committerJelmer Vernooij <jelmer@samba.org>2011-11-06 06:22:33 +0100
commit1ad05d8c099b167f34ce616414c8ea5ca35db26f (patch)
tree94ceeb0d405328c86a2c0530e7538f10a6977f09 /source4/scripting/python/samba/join.py
parent2a8650ed79ef389e76caa7ce45ddcb2c682f56f6 (diff)
downloadsamba-1ad05d8c099b167f34ce616414c8ea5ca35db26f.tar.gz
samba-1ad05d8c099b167f34ce616414c8ea5ca35db26f.tar.xz
samba-1ad05d8c099b167f34ce616414c8ea5ca35db26f.zip
Some formatting fixes, remove unused imports.
Autobuild-User: Jelmer Vernooij <jelmer@samba.org> Autobuild-Date: Sun Nov 6 06:22:33 CET 2011 on sn-devel-104
Diffstat (limited to 'source4/scripting/python/samba/join.py')
-rw-r--r--source4/scripting/python/samba/join.py7
1 files changed, 1 insertions, 6 deletions
diff --git a/source4/scripting/python/samba/join.py b/source4/scripting/python/samba/join.py
index b01ac0cc7a..7ce53442a4 100644
--- a/source4/scripting/python/samba/join.py
+++ b/source4/scripting/python/samba/join.py
@@ -23,7 +23,7 @@
from samba.auth import system_session
from samba.samdb import SamDB
from samba import gensec, Ldb, drs_utils
-import ldb, samba, sys, os, uuid
+import ldb, samba, sys, uuid
from samba.ndr import ndr_pack
from samba.dcerpc import security, drsuapi, misc, nbt, lsa, drsblobs
from samba.credentials import Credentials, DONT_USE_KERBEROS
@@ -125,7 +125,6 @@ class dc_join(object):
ctx.managedby = None
ctx.subdomain = False
-
def del_noerror(ctx, dn, recursive=False):
if recursive:
try:
@@ -375,7 +374,6 @@ class dc_join(object):
raise RuntimeError("DsAddEntry failed")
return ctr.objects
-
def join_add_ntdsdsa(ctx):
'''add the ntdsdsa object'''
# FIXME: the partition (NC) assignment has to be made dynamic
@@ -412,7 +410,6 @@ class dc_join(object):
res = ctx.samdb.search(base=ctx.ntds_dn, scope=ldb.SCOPE_BASE, attrs=["objectGUID"])
ctx.ntds_guid = misc.GUID(ctx.samdb.schema_format_value("objectGUID", res[0]["objectGUID"][0]))
-
def join_add_objects(ctx):
'''add the various objects needed for the join'''
if ctx.acct_dn:
@@ -497,7 +494,6 @@ class dc_join(object):
"userAccountControl")
ctx.samdb.modify(m)
-
def join_add_objects2(ctx):
'''add the various objects needed for the join, for subdomains post replication'''
@@ -617,7 +613,6 @@ class dc_join(object):
dns_backend="BIND9_FLATFILE")
print("Provision OK for domain %s" % ctx.names.dnsdomain)
-
def join_replicate(ctx):
'''replicate the SAM'''