Package: mtr
Version: 0.85-2.1
Followup-For: Bug #528992
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu utopic ubuntu-patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to achieve the following:

My attempt at getting a patch I submitted upstream applied to the mtr
package.

It basically fixes LP: #752583 where IPv6 nameservers specified in
/etc/resolv.conf aren't counted and therefore mtr aborts when there
are *only* IPv6 nameservers specified.

Example /etc/resolv.conf:

| nameserver ::1
| domain local
| options timeout:3 no-check-names

Output from mtr without the fix:

| Start: Fri Aug 15 14:01:25 2014
| No nameservers defined.

A pull request has been submitted on GitHub to have this change
merged upstream[1].

[1]https://github.com/traviscross/mtr/pull/56

  * Non-maintainer upload.
  * Added patch to include count of IPv6 nameservers fixing
    LP:#752583.


Thanks for considering the patch.


-- System Information:
Debian Release: jessie/sid
  APT prefers utopic-updates
  APT policy: (500, 'utopic-updates'), (500, 'utopic-security'), (500, 'utopic')
Architecture: amd64 (x86_64)

Kernel: Linux 3.16.0-7-generic (SMP w/4 CPU cores)
Locale: LANG=C.UTF-8, LC_CTYPE=C.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -u mtr-0.85/debian/changelog mtr-0.85/debian/changelog
only in patch2:
unchanged:
--- mtr-0.85.orig/dns.c
+++ mtr-0.85/dns.c
@@ -510,10 +510,15 @@
 
 void dns_open(void)
 {
-  int option,i;
+  int option,i,nscount;
 
   if (!dns) return;
   MY_RES_INIT();
+#ifdef ENABLE_IPV6
+  nscount = myres.nscount + myres._u._ext.nscount6;
+# else
+  nscount = myres.nscount
+#endif
   if (!myres.nscount) {
     fprintf(stderr,"No nameservers defined.\n");
     exit(-1);

Reply via email to