From: Amitay Isaacs <amitay@gmail.com>
Date: Wed, 15 Feb 2012 09:56:38 +0000 (+1100)
Subject: samba-tool: dns: Fix the output display of DNS records
X-Git-Tag: samba-4.0.0alpha18~48
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=61d4d7414585149ff0b703c139201d74c7800cd1;p=thirdparty%2Fsamba.git

samba-tool: dns: Fix the output display of DNS records
---

diff --git a/source4/scripting/python/samba/netcmd/dns.py b/source4/scripting/python/samba/netcmd/dns.py
index 31529c7dedd..2f7773aca2e 100644
--- a/source4/scripting/python/samba/netcmd/dns.py
+++ b/source4/scripting/python/samba/netcmd/dns.py
@@ -345,9 +345,10 @@ def print_dns_record(outf, rec):
                     rec.data.NamePrimaryServer.str,
                     rec.data.ZoneAdministratorEmail.str)
     elif rec.wType == dnsp.DNS_TYPE_MX:
-        mesg = 'MX: %s' % (rec.data.str)
+        mesg = 'MX: %s (%d)' % (rec.data.nameExchange.str, rec.data.wPreference)
     elif rec.wType == dnsp.DNS_TYPE_SRV:
-        mesg = 'SRV: %s (%d)' % (rec.data.nameTarget.str, rec.data.wPort)
+        mesg = 'SRV: %s (%d, %d, %d)' % (rec.data.nameTarget.str, rec.data.wPort,
+                                         rec.data.wPriority, rec.data.wWeight)
     outf.write('    %s (flags=%x, serial=%d, ttl=%d)\n' % (
                 mesg, rec.dwFlags, rec.dwSerial, rec.dwTtlSeconds))