sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-25 17:57:42 +03:00
Code

samba_upgradedns: Do not print confusing logs about missing .zone files

Browse Source 
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
This commit is contained in:
Andrew Bartlett 2020-11-24 10:15:43 +13:00 committed by Stefan Metzmacher
parent a31891c742
commit 53274d1148
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source4/scripting/bin/samba_upgradedns
View File

@ -331,11 +331,9 @@ if __name__ == '__main__':
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")
autofill = True
else:
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
@ -373,6 +371,9 @@ if __name__ == '__main__':
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,