diff options
| author | Garming Sam <garming@samba.org> | 2016-07-26 11:13:56 +0200 |
|---|---|---|
| committer | Garming Sam <garming@samba.org> | 2016-08-29 08:53:13 +0200 |
| commit | ddc059397d14ea11dfac1caa4d1b23288fdd1ee8 (patch) | |
| tree | b415a8f7d27c48d194c7f12c935f92de26f8e37f /source4/scripting/bin | |
| parent | 38696630552d449ec3c8e1fbdf6fb8212a96d2c9 (diff) | |
| download | samba-ddc059397d14ea11dfac1caa4d1b23288fdd1ee8.tar.gz | |
samba_upgradedns: Check for both accounts in BIND_DLZ upgrade
Signed-off-by: Garming Sam <garming@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
BUG: https://bugzilla.samba.org/show_bug.cgi?id=10882
Autobuild-User(master): Garming Sam <garming@samba.org>
Autobuild-Date(master): Mon Aug 29 08:53:14 CEST 2016 on sn-devel-144
Diffstat (limited to 'source4/scripting/bin')
| -rwxr-xr-x | source4/scripting/bin/samba_upgradedns | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/source4/scripting/bin/samba_upgradedns b/source4/scripting/bin/samba_upgradedns index 596371226ae..d00b67daca1 100755 --- a/source4/scripting/bin/samba_upgradedns +++ b/source4/scripting/bin/samba_upgradedns @@ -413,13 +413,17 @@ if __name__ == '__main__': if opts.dns_backend == "BIND9_DLZ": # Check if dns-HOSTNAME account exists and create it if required secrets_msgs = ldbs.secrets.search(expression='(samAccountName=dns-%s)' % hostname, attrs=['secret']) - if len(secrets_msgs) == 0: + msg = ldbs.sam.search(base=domaindn, scope=ldb.SCOPE_DEFAULT, + expression='(sAMAccountName=dns-%s)' % (hostname), + attrs=[]) + if len(secrets_msgs) == 0 or len(msg) == 0: logger.info("Adding dns-%s account" % hostname) - msg = ldbs.sam.search(base=domaindn, scope=ldb.SCOPE_DEFAULT, - expression='(sAMAccountName=dns-%s)' % (hostname), - attrs=[]) + if len(secrets_msgs) == 1: + dn = secrets_msgs[0].dn + ldbs.secrets.delete(dn) + if len(msg) == 1: dn = msg[0].dn ldbs.sam.delete(dn) |