[patch] Patch correcting file paths and specifying python2 in the shebang line.

verify.patch (text/plain), 2.72 KB, created by Peter Wilmott (RETIRED) on 2014-03-27 13:22:18 UTC

--- verify_orig	2014-03-27 13:18:12.000000000 +0000
+++ verify_new	2014-03-27 13:15:30.000000000 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python2
 #
 # Copyright (C) 2012 Paul Wouters <[e-mail]>
 #
@@ -237,7 +237,7 @@
 
 def cmdchecks():
 	printfun("Checking 'ip' command")
-	if not os.path.isfile("/sbin/ip") and not os.path.isfile("/usr/sbin/ip"):
+	if not os.path.isfile("/bin/ip") and not os.path.isfile("/usr/bin/ip"):
 			print_result("FAIL","FAILED")
 	p = subprocess.Popen(["ip", "xfrm"], stdout=subprocess.PIPE, stderr=subprocess.PIPE) 
 	output, err = p.communicate()
@@ -255,7 +255,7 @@
 def udp500check():
 	printfun(" Pluto listening for IKE on udp 500")
 	if 1==1:
-		p = subprocess.Popen(["/usr/sbin/ss", "-n", "-l", "-u", "sport = :500"], stdout=subprocess.PIPE, stderr=subprocess.PIPE) 
+		p = subprocess.Popen(["/sbin/ss", "-n", "-l", "-u", "sport = :500"], stdout=subprocess.PIPE, stderr=subprocess.PIPE) 
 		output, err = p.communicate()
 		if ":500" in output:
 			print_result("OK","OK")
@@ -270,7 +270,7 @@
 def tcp500check():
 	printfun(" Pluto listening for IKE on tcp 500")
 	try:
-		p = subprocess.Popen(["/usr/sbin/ss", "-n", "-l", "-t", "sport = :500"], stdout=subprocess.PIPE, stderr=subprocess.PIPE) 
+		p = subprocess.Popen(["/sbin/ss", "-n", "-l", "-t", "sport = :500"], stdout=subprocess.PIPE, stderr=subprocess.PIPE) 
 		output, err = p.communicate()
 		if ":500" in output:
 			print_result("OK","OK")
@@ -282,7 +282,7 @@
 def udp4500check():
 	printfun(" Pluto listening for IKE/NAT-T on udp 4500")
 	try:
-		p = subprocess.Popen(["/usr/sbin/ss", "-n", "-l", "-u", "sport = :4500"], stdout=subprocess.PIPE, stderr=subprocess.PIPE) 
+		p = subprocess.Popen(["/sbin/ss", "-n", "-l", "-u", "sport = :4500"], stdout=subprocess.PIPE, stderr=subprocess.PIPE) 
 		output, err = p.communicate()
 		if ":4500" in output:
 			print_result("OK","OK")
@@ -295,7 +295,7 @@
 def tcp4500check():
 	printfun(" Pluto listening for IKE/NAT-T on tcp 4500")
 	try:
-		p = subprocess.Popen(["/usr/sbin/ss", "-n", "-l", "-t", "sport = :4500"], stdout=subprocess.PIPE, stderr=subprocess.PIPE) 
+		p = subprocess.Popen(["/sbin/ss", "-n", "-l", "-t", "sport = :4500"], stdout=subprocess.PIPE, stderr=subprocess.PIPE) 
 		output, err = p.communicate()
 		if ":4500" in output:
 			print_result("OK","OK")
@@ -308,7 +308,7 @@
 def tcp10000check():
 	printfun(" Pluto listening for IKE on tcp 10000 (cisco)")
 	try:
-		p = subprocess.Popen(["/usr/sbin/ss", "-n", "-l", "-t", "sport = :10000"], stdout=subprocess.PIPE, stderr=subprocess.PIPE) 
+		p = subprocess.Popen(["/sbin/ss", "-n", "-l", "-t", "sport = :10000"], stdout=subprocess.PIPE, stderr=subprocess.PIPE) 
 		output, err = p.communicate()
 		if ":10000" in output:
 			print_result("OK","OK")