diff -Nru openswan-2.3.0.orig/programs/auto/auto.in openswan-2.3.0/programs/auto/auto.in --- openswan-2.3.0.orig/programs/auto/auto.in 2004-11-12 06:18:54.000000000 +0200 +++ openswan-2.3.0/programs/auto/auto.in 2005-09-13 20:11:47.218858472 +0300 @@ -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 defaultconn(k, val) { if (!(k in s)) s[k] = val } @@ -313,7 +313,7 @@ if (!seensome) fail("internal error, output called inappropriately") - default("type", "tunnel") + defaultconn("type", "tunnel") type_flags = "" t = s["type"] if (t == "tunnel") { @@ -335,7 +335,7 @@ } else fail("unknown type " v(t)) - default("failureshunt", "none") + defaultconn("failureshunt", "none") t = s["failureshunt"] if (t == "passthrough") type_flags = type_flags " --failpass"; @@ -362,52 +362,52 @@ nexthopset("right", drnexthop) } - default("keyexchange", "ike") + defaultconn("keyexchange", "ike") if (s["keyexchange"] != "ike") fail("only know how to do keyexchange=ike") - default("auth", "esp") + defaultconn("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") + defaultconn("pfs", "yes") yesno("aggrmode") - default("aggrmode", "no") + defaultconn("aggrmode", "no") duration("dpddelay") duration("dpdtimeout") if(("dpddelay" in s) && !("dpdtimeout" in s)) - default("dpdtimeout",120) + defaultconn("dpdtimeout",120) if(!("dpddelay" in s) && ("dpdtimeout" in s)) - default("dpddelay",30) - default("dpdaction","hold") + defaultconn("dpddelay",30) + defaultconn("dpdaction","hold") yesno("forceencaps") - default("forceencaps", "no") + defaultconn("forceencaps", "no") yesno("xauth") - default("xauth", "no") + defaultconn("xauth", "no") yesno("xauthserver") - default("xauthserver", "no") + defaultconn("xauthserver", "no") yesno("xauthclient") - default("xauthclient", "no") + defaultconn("xauthclient", "no") yesno("modecfgserver") - default("modecfgserver", "no") + defaultconn("modecfgserver", "no") yesno("modecfgclient") - default("modecfgclient", "no") + defaultconn("modecfgclient", "no") yesno("modecfgpull") - default("modecfgpull", "no") + defaultconn("modecfgpull", "no") yesno("compress") - default("compress", "no") - default("keylife", "8h") + defaultconn("compress", "no") + defaultconn("keylife", "8h") duration("keylife") yesno("rekey") - default("rekey", "yes") - default("rekeymargin", "9m") + defaultconn("rekey", "yes") + defaultconn("rekeymargin", "9m") duration("rekeymargin") - default("keyingtries", "%forever") + defaultconn("keyingtries", "%forever") if (s["keyingtries"] == "%forever") s["keyingtries"] = 0 integer("keyingtries") @@ -419,13 +419,13 @@ integer("rekeyfuzz") } duration("ikelifetime") - default("disablearrivalcheck", "no") + defaultconn("disablearrivalcheck", "no") - default("leftsendcert", "always") - default("rightsendcert", "always") + defaultconn("leftsendcert", "always") + defaultconn("rightsendcert", "always") - default("leftnexthop", "%direct") - default("rightnexthop", "%direct") + defaultconn("leftnexthop", "%direct") + defaultconn("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") + defaultconn("leftupdown", "ipsec _updown") + defaultconn("rightupdown", "ipsec _updown") + defaultconn("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") + defaultconn("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") + defaultconn("rightrsasigkey", "%dnsondemand") if (id("right") == "%any" && !(s["rightrsasigkey"] == "%cert" || s["rightrsasigkey"] == "0x00") ) @@ -476,7 +476,7 @@ settings = type_flags # BEGIN IPv6 - default("connaddrfamily", "ipv4") + defaultconn("connaddrfamily", "ipv4") if (s["connaddrfamily"] == "ipv6") { settings = settings " --ipv6" } else if (s["connaddrfamily"] != "ipv4") { diff -Nru openswan-2.3.0.orig/programs/_confread/_confread.in openswan-2.3.0/programs/_confread/_confread.in --- openswan-2.3.0.orig/programs/_confread/_confread.in 2004-11-12 06:18:03.000000000 +0200 +++ openswan-2.3.0/programs/_confread/_confread.in 2005-09-13 20:13:20.994602392 +0300 @@ -181,7 +181,7 @@ # if searching, seen is set of sectionnames which match # if not searching, seen is set of parameter names found seen[""] = "" - default[""] = "" + defaultconn[""] = "" usesdefault[""] = "" orientation = 1 } @@ -286,8 +286,8 @@ output(o_section, sn) # do not accept anything from conn %default - for (i in default) - delete default[i] + for (i in defaultconn) + delete defaultconn[i] output(o_parm, orient("left"), "%defaultroute") output(o_parm, orient("leftid"), "%myid") @@ -425,11 +425,11 @@ if (!usesdefault[sectionname]) fail("duplicated parameter " bq search eq) usesdefault[sectionname] = 0 - } else if (search in default) + } else if (search in defaultconn) fail("duplicated parameter " bq search eq) if (rest in wanted) { # a hit if (indefault) - default[search] = rest + defaultconn[search] = rest else searchfound(sectionname) } else { @@ -491,9 +491,9 @@ fail("white space within non-quoted parameter " bq name eq) } indefault { - if (name in default) + if (name in defaultconn) fail("duplicated default parameter " bq name eq) - default[name] = value + defaultconn[name] = value next } { @@ -565,11 +565,11 @@ 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 defaultconn) if (!(name in seen)) - output(o_parm, name, default[name]) + output(o_parm, name, defaultconn[name]) } else { - if (default[search] in wanted) + if (defaultconn[search] in wanted) for (name in usesdefault) if (usesdefault[name]) seen[name] = 1 diff -Nru openswan-2.3.0.orig/programs/manual/manual.in openswan-2.3.0/programs/manual/manual.in --- openswan-2.3.0.orig/programs/manual/manual.in 2004-11-02 00:49:01.000000000 +0200 +++ openswan-2.3.0/programs/manual/manual.in 2005-09-13 20:12:41.982533128 +0300 @@ -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 defaultconn(k, v) { if (!(k in s)) s[k] = v } @@ -323,7 +323,7 @@ ######### if (failed) exit 1 - default("type", "tunnel") + defaultconn("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") + defaultconn("leftsubnet", s["left"] "/32") rightsub = ("rightsubnet" in s) ? 1 : 0 - default("rightsubnet", s["right"] "/32") + defaultconn("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"]) + defaultconn("leftnexthop", s["right"]) + defaultconn("rightnexthop", s["left"]) if (s["leftnexthop"] == s["left"]) fail("left and leftnexthop must not be the same") if (s["rightnexthop"] == s["right"])