[patch] Patch the ipsec files to work with gawk

ipsec.patches (text/plain), 5.27 KB, created by Thomas Bullinger on 2005-09-11 15:26:19 UTC

diff -Naupr /usr/lib/ipsec/_confread.ORIG /usr/lib/ipsec/_confread
--- /usr/lib/ipsec/_confread.ORIG	2005-09-11 18:15:20.000000000 -0400
+++ /usr/lib/ipsec/_confread	2005-09-11 18:20:37.000000000 -0400
@@ -181,7 +181,7 @@ awk 'BEGIN {
 	# if searching, seen is set of sectionnames which match
 	# if not searching, seen is set of parameter names found
 	seen[""] = ""
-	default[""] = ""
+	conndefault[""] = ""
 	usesdefault[""] = ""
 	orientation = 1
 }
@@ -286,8 +286,8 @@ function jam(sn, au) {
 			output(o_section, sn)
 
 			# do not accept anything from conn %default
-			for (i in default)
-				delete default[i]
+			for (i in conndefault)
+				delete conndefault[i]
 
 			output(o_parm, orient("left"), "%defaultroute")
 			output(o_parm, orient("leftid"), "%myid")
@@ -425,11 +425,11 @@ searching && $0 ~ searchpat {
 		if (!usesdefault[sectionname])
 			fail("duplicated parameter " bq search eq)
 		usesdefault[sectionname] = 0
-	} else if (search in default)
+	} else if (search in conndefault)
 		fail("duplicated parameter " bq search eq)
 	if (rest in wanted) {	# a hit
 		if (indefault)
-			default[search] = rest
+			conndefault[search] = rest
 		else
 			searchfound(sectionname)
 	} else {
@@ -491,9 +491,9 @@ $0 ~ /^(also|alsoflip)=/ {
 		fail("white space within non-quoted parameter " bq name eq)
 }
 indefault {
-	if (name in default)
+	if (name in conndefault)
 		fail("duplicated default parameter " bq name eq)
-	default[name] = value
+	conndefault[name] = value
 	next
 }
 {
@@ -565,11 +565,11 @@ END {
 	if (!optional && !searching && unseen != "")
 		fail("did not find " type " section(s) " bq substr(unseen, 2) eq)
 	if (!searching) {
-		for (name in default)
+		for (name in conndefault)
 			if (!(name in seen))
-				output(o_parm, name, default[name])
+				output(o_parm, name, conndefault[name])
 	} else {
-		if (default[search] in wanted)
+		if (conndefault[search] in wanted)
 			for (name in usesdefault)
 				if (usesdefault[name])
 					seen[name] = 1
diff -Naupr /usr/libexec/ipsec/auto.ORIG /usr/libexec/ipsec/auto
--- /usr/lib/ipsec/_confread.ORIG	2005-09-11 18:15:20.000000000 -0400
+++ /usr/lib/ipsec/_confread	2005-09-11 18:20:37.000000000 -0400
@@ -181,7 +181,7 @@ awk 'BEGIN {
 	# if searching, seen is set of sectionnames which match
 	# if not searching, seen is set of parameter names found
 	seen[""] = ""
-	default[""] = ""
+	conndefault[""] = ""
 	usesdefault[""] = ""
 	orientation = 1
 }
@@ -286,8 +286,8 @@ function jam(sn, au) {
 			output(o_section, sn)
 
 			# do not accept anything from conn %default
-			for (i in default)
-				delete default[i]
+			for (i in conndefault)
+				delete conndefault[i]
 
 			output(o_parm, orient("left"), "%defaultroute")
 			output(o_parm, orient("leftid"), "%myid")
@@ -425,11 +425,11 @@ searching && $0 ~ searchpat {
 		if (!usesdefault[sectionname])
 			fail("duplicated parameter " bq search eq)
 		usesdefault[sectionname] = 0
-	} else if (search in default)
+	} else if (search in conndefault)
 		fail("duplicated parameter " bq search eq)
 	if (rest in wanted) {	# a hit
 		if (indefault)
-			default[search] = rest
+			conndefault[search] = rest
 		else
 			searchfound(sectionname)
 	} else {
@@ -491,9 +491,9 @@ $0 ~ /^(also|alsoflip)=/ {
 		fail("white space within non-quoted parameter " bq name eq)
 }
 indefault {
-	if (name in default)
+	if (name in conndefault)
 		fail("duplicated default parameter " bq name eq)
-	default[name] = value
+	conndefault[name] = value
 	next
 }
 {
@@ -565,11 +565,11 @@ END {
 	if (!optional && !searching && unseen != "")
 		fail("did not find " type " section(s) " bq substr(unseen, 2) eq)
 	if (!searching) {
-		for (name in default)
+		for (name in conndefault)
 			if (!(name in seen))
-				output(o_parm, name, default[name])
+				output(o_parm, name, conndefault[name])
 	} else {
-		if (default[search] in wanted)
+		if (conndefault[search] in wanted)
 			for (name in usesdefault)
 				if (usesdefault[name])
 					seen[name] = 1
diff -Naupr /usr/libexec/ipsec/manual.ORIG /usr/libexec/ipsec/manual
--- /usr/libexec/ipsec/manual.ORIG	2005-09-11 18:03:42.000000000 -0400
+++ /usr/libexec/ipsec/manual	2005-09-11 18:23:03.000000000 -0400
@@ -210,7 +210,7 @@ awk '	BEGIN {
 		if ((k in s) && s[k] != "yes" && s[k] != "no")
 			fail("parameter \"" k "\" must be \"yes\" or \"no\"")
 	}
-	function default(k, v) {
+	function conndefault(k, v) {
 		if (!(k in s))
 			s[k] = v
 	}
@@ -323,7 +323,7 @@ awk '	BEGIN {
 	#########
 	if (failed)
 		exit 1
-	default("type", "tunnel")
+	conndefault("type", "tunnel")
 	type = s["type"]
 	shunt = 0
 	if (type == "transport") {
@@ -364,9 +364,9 @@ awk '	BEGIN {
 	}
 
 	leftsub = ("leftsubnet" in s) ? 1 : 0
-	default("leftsubnet", s["left"] "/32")
+	conndefault("leftsubnet", s["left"] "/32")
 	rightsub = ("rightsubnet" in s) ? 1 : 0
-	default("rightsubnet", s["right"] "/32")
+	conndefault("rightsubnet", s["right"] "/32")
 	integer("espreplay_window")
 	if (("espreplay_window" in s) && s["espreplay_window"] == 0)
 		delete s["espreplay_window"]
@@ -376,8 +376,8 @@ awk '	BEGIN {
 	netfix("left")
 	netfix("right")
 
-	default("leftnexthop", s["right"])
-	default("rightnexthop", s["left"])
+	conndefault("leftnexthop", s["right"])
+	conndefault("rightnexthop", s["left"])
 	if (s["leftnexthop"] == s["left"])
 		fail("left and leftnexthop must not be the same")
 	if (s["rightnexthop"] == s["right"])