diff options
Diffstat (limited to 'source4/scripting/bin')
| -rwxr-xr-x | source4/scripting/bin/samba_dnsupdate | 6 | ||||
| -rwxr-xr-x | source4/scripting/bin/upgradeprovision | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/source4/scripting/bin/samba_dnsupdate b/source4/scripting/bin/samba_dnsupdate index b3956aa2c4..73611c8901 100755 --- a/source4/scripting/bin/samba_dnsupdate +++ b/source4/scripting/bin/samba_dnsupdate @@ -34,7 +34,6 @@ import samba import optparse from samba import getopt as options from ldb import SCOPE_BASE -from samba import glue from samba.auth import system_session from samba.samdb import SamDB @@ -69,7 +68,7 @@ if opts.all_interfaces: else: all_interfaces = False -IPs = glue.interface_ips(lp, all_interfaces) +IPs = samba.interface_ips(lp, all_interfaces) nsupdate_cmd = lp.get('nsupdate command') if len(IPs) == 0: @@ -200,7 +199,8 @@ def get_subst_vars(): global lp vars = {} - samdb = SamDB(url=lp.get("sam database"), session_info=system_session(), lp=lp) + samdb = SamDB(url=lp.get("sam database"), session_info=system_session(), + lp=lp) vars['DNSDOMAIN'] = lp.get('realm').lower() vars['HOSTNAME'] = lp.get('netbios name').lower() + "." + vars['DNSDOMAIN'] diff --git a/source4/scripting/bin/upgradeprovision b/source4/scripting/bin/upgradeprovision index 8f01bd3bf0..234152b002 100755 --- a/source4/scripting/bin/upgradeprovision +++ b/source4/scripting/bin/upgradeprovision @@ -39,7 +39,6 @@ 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 import glue 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 from samba.provisionexceptions import ProvisioningError @@ -845,7 +844,7 @@ def update_machine_account_password(paths, creds, session, names): assert(len(res) == 1) msg = Message(res[0].dn) - machinepass = glue.generate_random_password(128, 255) + machinepass = samba.generate_random_password(128, 255) msg["userPassword"] = MessageElement(machinepass, FLAG_MOD_REPLACE, "userPassword") sam_ldb.modify(msg) |