summaryrefslogtreecommitdiff
path: root/source4/scripting/bin
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2010-06-13 15:05:50 +0200
committerJelmer Vernooij <jelmer@samba.org>2010-06-13 18:19:03 +0200
commit956a256faa035fbc43dbd37273d1c5d62aee0735 (patch)
tree80f7bd6a8d293eb0f0620dbda60cbbe123f8b75e /source4/scripting/bin
parentf0afda14ba95bc16ec8ca2377640f4ee13825af9 (diff)
downloadsamba-956a256faa035fbc43dbd37273d1c5d62aee0735.tar.gz
samba-956a256faa035fbc43dbd37273d1c5d62aee0735.tar.bz2
samba-956a256faa035fbc43dbd37273d1c5d62aee0735.zip
s4-python: Start using standard python logging infrastructure rather
than simple messaging callbacks.
Diffstat (limited to 'source4/scripting/bin')
-rwxr-xr-xsource4/scripting/bin/rebuildextendeddn9
-rwxr-xr-xsource4/scripting/bin/upgradeprovision9
2 files changed, 8 insertions, 10 deletions
diff --git a/source4/scripting/bin/rebuildextendeddn b/source4/scripting/bin/rebuildextendeddn
index eed3a17edf..1154b7cb46 100755
--- a/source4/scripting/bin/rebuildextendeddn
+++ b/source4/scripting/bin/rebuildextendeddn
@@ -23,7 +23,6 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
-import getopt
import optparse
import os
import sys
@@ -33,14 +32,12 @@ sys.path.insert(0, "bin/python")
import samba
from samba.credentials import DONT_USE_KERBEROS
from samba.auth import system_session
-from samba import Ldb, substitute_var, valid_netbios_name, check_all_substituted
-from ldb import SCOPE_SUBTREE, SCOPE_ONELEVEL, SCOPE_BASE, LdbError, \
- timestring, CHANGETYPE_MODIFY, CHANGETYPE_NONE
+from samba import Ldb
+from ldb import SCOPE_SUBTREE, SCOPE_BASE
import ldb
import samba.getopt as options
-from samba.samdb import SamDB
from samba import param
-from samba.provision import ProvisionPaths, ProvisionNames, provision_paths_from_lp
+from samba.provision import ProvisionNames, provision_paths_from_lp
from samba.schema import get_dnsyntax_attributes, get_linked_attributes
parser = optparse.OptionParser("provision [options]")
diff --git a/source4/scripting/bin/upgradeprovision b/source4/scripting/bin/upgradeprovision
index 066fbe469c..518bba68c7 100755
--- a/source4/scripting/bin/upgradeprovision
+++ b/source4/scripting/bin/upgradeprovision
@@ -35,12 +35,13 @@ import samba.getopt as options
from samba.credentials import DONT_USE_KERBEROS
from samba.auth import system_session, admin_session
from samba import Ldb, version
-from ldb import SCOPE_SUBTREE, SCOPE_BASE, \
- FLAG_MOD_REPLACE, FLAG_MOD_ADD, FLAG_MOD_DELETE,\
- MessageElement, Message, Dn
+from ldb import (SCOPE_SUBTREE, SCOPE_BASE, FLAG_MOD_REPLACE,
+ FLAG_MOD_ADD, FLAG_MOD_DELETE, MessageElement, Message, Dn)
from samba import param
from samba.misc import messageEltFlagToString
-from samba.provision import find_setup_dir, get_domain_descriptor, get_config_descriptor, secretsdb_self_join,set_gpo_acl,getpolicypath,create_gpo_struct, ProvisioningError
+from samba.provision import (find_setup_dir, get_domain_descriptor,
+ get_config_descriptor, secretsdb_self_join, set_gpo_acl,
+ getpolicypath, create_gpo_struct, ProvisioningError)
from samba.schema import get_linked_attributes, Schema, get_schema_descriptor
from samba.dcerpc import security
from samba.ndr import ndr_unpack