[Swan-dev] libreswan 3.9rc1 Release Candidate: please test!

Paul Wouters paul at nohats.ca
Fri Jul 4 17:53:51 EEST 2014


On Fri, 4 Jul 2014, Ruben Laban wrote:

> I needed to apply to tiny patches to make it work for me:
>
> diff --git a/initsystems/upstart/ipsec.conf.in 
> b/initsystems/upstart/ipsec.conf.in
> index 50dd97d..c2cc783 100644
> --- a/initsystems/upstart/ipsec.conf.in
> +++ b/initsystems/upstart/ipsec.conf.in
> @@ -23,7 +23,7 @@ script
>     @FINALLIBEXECDIR@/pluto --config @FINALCONFFILE@ --nofork $PLUTO_OPTIONS
> end script
>
> -post-stop script
> +pre-stop script

Applied!

> diff --git a/programs/_stackmanager/_stackmanager.in 
> b/programs/_stackmanager/_stackmanager.in
> index 6c2a98f..0ad1066 100644
> --- a/programs/_stackmanager/_stackmanager.in
> +++ b/programs/_stackmanager/_stackmanager.in
> @@ -367,7 +367,6 @@ startklips() {
>                if ($1 == "inet")
>                    sub(" [^ ]+:[^ ]+"," ",$0)
>                    sub("/.*","",$2)
> -                   sub("dynamic","",$7)
>                    for (i = 2; i < NF; i++) {
>                        if ($i == "brd" || $i == "peer" || $i == "secondary")
>                            i++


> Second hunk: the sub() makes it that NF becomes 7, breaking the for() loop 
> after it. Another option is to replace that line with sub("dynamic","",$0). I 
> don't think it's needed at all, as the first line of the awk stuff already 
> excludes dynamic IP addresses.

That change came in via this commit:

 	commit c50fd74813a125afe53219b9989b321f907ba48a
 	Author: Paul Wouters <pwouters at redhat.com>
 	Date:   Sun Mar 30 19:51:57 2014 -0400

     	_stackmanager: filter out "dynamic" for inet ip addr add command.

So it looks like we did see "dynamic" on IPv4 address lines in the "ip
addr show" command?

I've used your second suggestion for now, although I think that would
not filter out those occurances. But I don't have a system right now
where I see this happening to confirm.

Paul



More information about the Swan-dev mailing list