samba_upgradedns prints confusing logs about upgrading zone files
and automatically creating DNS zones when the zone already exists.
We need to move the logging to later when we know we what we are
using the parsed information for.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14580
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Autobuild-User(master): Stefan Metzmacher <metze@samba.org>
Autobuild-Date(master): Thu Nov 26 08:16:04 UTC 2020 on sn-devel-184
serial = int(rrset[0].serial)
except Exception as e:
logger.warn("Error parsing DNS data from '%s' (%s)" % (paths.dns, str(e)))
serial = int(rrset[0].serial)
except Exception as e:
logger.warn("Error parsing DNS data from '%s' (%s)" % (paths.dns, str(e)))
- logger.warn("DNS records will be automatically created")
- logger.info("No zone file %s" % paths.dns)
- logger.warn("DNS records will be automatically created")
+ logger.info("No zone file %s (normal)" % paths.dns)
autofill = True
# Create DNS partitions if missing and fill DNS information
autofill = True
# Create DNS partitions if missing and fill DNS information
dnsadmins_sid, FILL_FULL)
logger.info("Populating DNS partitions")
dnsadmins_sid, FILL_FULL)
logger.info("Populating DNS partitions")
+ if autofill:
+ logger.warn("DNS records will be automatically created")
+
fill_dns_data_partitions(ldbs.sam, domainsid, site, domaindn, forestdn,
dnsdomain, dnsforest, hostname, hostip, hostip6,
domainguid, ntdsguid, dnsadmins_sid,
fill_dns_data_partitions(ldbs.sam, domainsid, site, domaindn, forestdn,
dnsdomain, dnsforest, hostname, hostip, hostip6,
domainguid, ntdsguid, dnsadmins_sid,