diff -Nru openswan-2.4.3.orig/programs/auto/auto.in openswan-2.4.3/programs/auto/auto.in
--- openswan-2.4.3.orig/programs/auto/auto.in	2005-01-11 19:52:49.000000000 +0200
+++ openswan-2.4.3/programs/auto/auto.in	2005-11-19 16:28:57.488961000 +0200
@@ -220,7 +220,7 @@
 		if ((k in s) && s[k] != "yes" && s[k] != "no")
 			fail("parameter " v(k) " must be \"yes\" or \"no\"")
 	}
-	function default(k, val) {
+	function conndefault(k, val) {
 		if (!(k in s))
 			s[k] = val
 	}
@@ -313,7 +313,7 @@
 		if (!seensome)
 			fail("internal error, output called inappropriately")
 
-		default("type", "tunnel")
+		conndefault("type", "tunnel")
 		type_flags = ""
 		t = s["type"]
 		if (t == "tunnel") {
@@ -335,7 +335,7 @@
 		} else
 			fail("unknown type " v(t))
 
-		default("failureshunt", "none")
+		conndefault("failureshunt", "none")
 		t = s["failureshunt"]
 		if (t == "passthrough")
 			type_flags = type_flags " --failpass";
@@ -362,52 +362,52 @@
 			nexthopset("right", drnexthop)
 		}
 
-		default("keyexchange", "ike")
+		conndefault("keyexchange", "ike")
 		if (s["keyexchange"] != "ike")
 			fail("only know how to do keyexchange=ike")
-		default("auth", "esp")
+		conndefault("auth", "esp")
 		if (("auth" in s) && s["auth"] != "esp" && s["auth"] != "ah")
 			fail("only know how to do auth=esp or auth=ah")
 
 		yesno("pfs")
-		default("pfs", "yes")
+		conndefault("pfs", "yes")
 
  		yesno("aggrmode")
- 		default("aggrmode", "no")
+ 		conndefault("aggrmode", "no")
 
                 duration("dpddelay")
                 duration("dpdtimeout")
                 if(("dpddelay" in s) && !("dpdtimeout" in s))
-                        default("dpdtimeout",120)
+                        conndefault("dpdtimeout",120)
                 if(!("dpddelay" in s) && ("dpdtimeout" in s))
-                        default("dpddelay",30)
-                default("dpdaction","hold")
+                        conndefault("dpddelay",30)
+                conndefault("dpdaction","hold")
 
 		yesno("forceencaps")
-		default("forceencaps", "no")
+		conndefault("forceencaps", "no")
 		yesno("xauth")
-		default("xauth", "no")
+		conndefault("xauth", "no")
 		yesno("xauthserver")
-		default("xauthserver", "no")
+		conndefault("xauthserver", "no")
 		yesno("xauthclient")
-		default("xauthclient", "no")
+		conndefault("xauthclient", "no")
 		yesno("modecfgserver")
-		default("modecfgserver", "no")
+		conndefault("modecfgserver", "no")
 		yesno("modecfgclient")
-		default("modecfgclient", "no")
+		conndefault("modecfgclient", "no")
 
 		yesno("modecfgpull")
-		default("modecfgpull", "no")
+		conndefault("modecfgpull", "no")
 
 		yesno("compress")
-		default("compress", "no")
-		default("keylife", "8h")
+		conndefault("compress", "no")
+		conndefault("keylife", "8h")
 		duration("keylife")
 		yesno("rekey")
-		default("rekey", "yes")
-		default("rekeymargin", "9m")
+		conndefault("rekey", "yes")
+		conndefault("rekeymargin", "9m")
 		duration("rekeymargin")
-		default("keyingtries", "%forever")
+		conndefault("keyingtries", "%forever")
 		if (s["keyingtries"] == "%forever")
 			s["keyingtries"] = 0
 		integer("keyingtries")
@@ -419,13 +419,13 @@
 			integer("rekeyfuzz")
 		}
 		duration("ikelifetime")
-		default("disablearrivalcheck", "no")
+		conndefault("disablearrivalcheck", "no")
 
-		default("leftsendcert", "always")
-		default("rightsendcert", "always")
+		conndefault("leftsendcert", "always")
+		conndefault("rightsendcert", "always")
 
-		default("leftnexthop", "%direct")
-		default("rightnexthop", "%direct")
+		conndefault("leftnexthop", "%direct")
+		conndefault("rightnexthop", "%direct")
 		if (s["leftnexthop"] == s["left"])
 			fail("left and leftnexthop must not be the same")
 		if (s["rightnexthop"] == s["right"])
@@ -441,22 +441,22 @@
 			s["rightnexthop"] = drnexthop
 		}
 
-		default("leftupdown", "ipsec _updown")
-		default("rightupdown", "ipsec _updown")
-		default("authby", "rsasig")
+		conndefault("leftupdown", "ipsec _updown")
+		conndefault("rightupdown", "ipsec _updown")
+		conndefault("authby", "rsasig")
 		t = s["authby"]
 		if (t == "rsasig" || t == "secret|rsasig" || t == "rsasig|secret") {
 			authtype = "--rsasig"
 			type_flags = "--encrypt " type_flags
 			if (!("leftcert" in s)) {
-				default("leftrsasigkey", "%dnsondemand")
+				conndefault("leftrsasigkey", "%dnsondemand")
 				if (id("left") == "%any" &&
 				    !(s["leftrsasigkey"] == "%cert" ||
 				      s["leftrsasigkey"] == "0x00") )
 					fail("ID " v(id("left")) " cannot have RSA key")
 			}
 			if (!("rightcert" in s)) {
-				default("rightrsasigkey", "%dnsondemand")
+				conndefault("rightrsasigkey", "%dnsondemand")
 				if (id("right") == "%any" &&
 				    !(s["rightrsasigkey"] == "%cert" ||
 				      s["rightrsasigkey"] == "0x00") )
@@ -476,7 +476,7 @@
 		settings = type_flags
 
                 # BEGIN IPv6
-                default("connaddrfamily", "ipv4")
+                conndefault("connaddrfamily", "ipv4")
                 if (s["connaddrfamily"] == "ipv6") {
                         settings = settings " --ipv6"
                 } else if (s["connaddrfamily"] != "ipv4") {
diff -Nru openswan-2.4.3.orig/programs/manual/manual.in openswan-2.4.3/programs/manual/manual.in
--- openswan-2.4.3.orig/programs/manual/manual.in	2005-04-18 01:57:12.000000000 +0300
+++ openswan-2.4.3/programs/manual/manual.in	2005-11-19 16:28:57.488961000 +0200
@@ -210,7 +210,7 @@
 		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 @@
 	#########
 	if (failed)
 		exit 1
-	default("type", "tunnel")
+	conndefault("type", "tunnel")
 	type = s["type"]
 	shunt = 0
 	if (type == "transport") {
@@ -364,9 +364,9 @@
 	}
 
 	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 @@
 	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"])