File: 0003-apavel-new-net-dns-fix.diff

package info (click to toggle)
jdresolve 0.6.1-7
  • links: PTS
  • area: main
  • in suites: bookworm, forky, sid, trixie
  • size: 460 kB
  • sloc: sh: 70; makefile: 4
file content (44 lines) | stat: -rw-r--r-- 1,645 bytes parent folder | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
URL: https://github.com/jdrowell/jdresolve/commit/256eae5ccd7962d989b5946d7dd750d8d942ebe6

Index: jdresolve-0.6.1.new/jdresolve
===================================================================
--- jdresolve-0.6.1.new.orig/jdresolve	2022-03-07 16:06:33.799202504 +0100
+++ jdresolve-0.6.1.new/jdresolve	2022-03-07 16:07:59.346380593 +0100
@@ -857,7 +857,15 @@
 				# For each DNS answer, check the data received
 				if ($type eq 'H') {
 					if (defined $_->{ptrdname}) {
-						$hosts{$query}{NAME} = $_->{ptrdname};
+						if ($_->isa('Net::DNS::RR::PTR')) {
+							# Newer versions of Net::DNS
+							$hosts{$query}{NAME} = $_->rdatastr();
+							$hosts{$query}{NAME} =~ s/\.$//;
+						} else {
+							# Older versions of Net::DNS
+							$hosts{$query}{NAME} = $_->{ptrdname};
+						}
+
 						$hosts{$query}{RESOLVED} = 'N';
 
 						$resolved = 1;
Index: jdresolve-0.6.1.new/jdresolve.in
===================================================================
--- jdresolve-0.6.1.new.orig/jdresolve.in	2022-03-07 16:06:33.799202504 +0100
+++ jdresolve-0.6.1.new/jdresolve.in	2022-03-07 16:08:02.338352527 +0100
@@ -857,7 +857,15 @@
 				# For each DNS answer, check the data received
 				if ($type eq 'H') {
 					if (defined $_->{ptrdname}) {
-						$hosts{$query}{NAME} = $_->{ptrdname};
+						if ($_->isa('Net::DNS::RR::PTR')) {
+							# Newer versions of Net::DNS
+							$hosts{$query}{NAME} = $_->rdatastr();
+							$hosts{$query}{NAME} =~ s/\.$//;
+						} else {
+							# Older versions of Net::DNS
+							$hosts{$query}{NAME} = $_->{ptrdname};
+						}
+
 						$hosts{$query}{RESOLVED} = 'N';
 
 						$resolved = 1;