merge soc07 r5279 - nse fixes

nse_main.cc

@@ -465,8 +465,8 @@ int process_preparerunlevels(std::list<struct thread_record> torun_threads) {
 		if(runlevel_idx < (*runlevel_iter).runlevel) {
 			runlevel_idx = (*runlevel_iter).runlevel;
 			current_runlevel.clear();
-			//push_back an empty in which we store all scripts of the current 
-			//runlevel...
+			//push_back an empty list in which we store all scripts of the 
+			//current runlevel...
 			torun_scripts.push_back(current_runlevel);
 		}
 

nse_nmaplib.cc

@@ -379,11 +379,20 @@ static int l_set_port_version(lua_State* l, Target* target, Port* port) {
 //			tunnel, product, version,
 //			extrainfo, hostname, ostype, 
 //			devicetype, fingerprint);
-	port->setServiceProbeResults(probestate, name,
-			tunnel, product, version,
-			extrainfo, hostname, ostype, 
-			devicetype, NULL);
 
+//should prevent a assertion-failure during output if the OutputTable does 
+//not contain columns for the fields other than the name
+	if(o.servicescan){
+		port->setServiceProbeResults(probestate, name,
+				tunnel, product, version,
+				extrainfo, hostname, ostype, 
+				devicetype, NULL);
+	}else{
+		port->setServiceProbeResults(probestate, name,
+			tunnel, NULL, NULL,
+			NULL, NULL, NULL, 
+			NULL, NULL);
+	}
 
 
 	free(service_tunnel);

scripts/iax2Detect.nse

@@ -7,7 +7,7 @@ author = "Ferdy Riphagen <f.riphagen@nsec.nl>"
 
 license = "See nmap's COPYING for license"
 
-categories = {"safe", "discovery"}
+categories = {"version"}
 
 require "shortport"