aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-security/nmap/files/lua.patch
blob: 7cb86ab37358085db4d6947fa32a5dc193e8dbf3 (plain)
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
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
Added missing definitions which caused failuire at do_configure
with --without-liblua option.

Upstream Status : pending

Signed-off-by: Andrei Dinu <andrei.adrianx.dinu@intel.com>
--- a/output.h
+++ b/output.h
@@ -226,6 +226,10 @@
 void printscriptresults(ScriptResults *scriptResults, stype scantype);
 
 void printhostscriptresults(Target *currenths);
+
+/*This is a helper function to determine the ordering of the script results
+  based on their id */
+bool comparescriptids(ScriptResult first, ScriptResult second);
 #endif
 
 /* Print a table with traceroute hops. */
@@ -253,8 +257,4 @@
    were found. */
 void printdatafilepaths();
 
-/*This is a helper function to determine the ordering of the script results
-  based on their id */
-bool comparescriptids(ScriptResult first, ScriptResult second);
-
 #endif /* OUTPUT_H */
--- a/output.cc
+++ b/output.cc
@@ -2613,6 +2613,7 @@
   }
 }
 
+#ifndef NOLUA
 /*This is a helper function to determine the ordering of the script results
   based on their id */
 bool comparescriptids(ScriptResult first, ScriptResult second){
@@ -2625,5 +2626,6 @@
     else
         return false;
 }
+#endif
 
 
--- a/portlist.cc
+++ b/portlist.cc
@@ -144,6 +144,7 @@
   }
 }
 
+#ifndef NOLUA
 void Port::freeScriptResults(void)
 {
     while (!scriptResults.empty()) {
@@ -151,6 +152,7 @@
         scriptResults.pop_front();
     }
 }
+#endif
 
 /* Fills in namebuf (as long as there is space in buflen) with the
    Name nmap normal output will use to describe the port.  This takes
--- a/Target.cc
+++ b/Target.cc
@@ -162,10 +162,12 @@
 
 Target::~Target() {
   FreeInternal();
+#ifndef NOLUA
   while (!scriptResults.empty()) {
     scriptResults.front().clear();
     scriptResults.pop_front();
   }
+#endif
 }
 
 void Target::FreeInternal() {