From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: network@lists.ipfire.org
Subject: Re: [PATCH 1/2] network reset: destroy all IPsec pools
Date: Thu, 24 Aug 2017 13:57:02 +0100
Message-ID: <1503579422.14476.6.camel@ipfire.org>
In-Reply-To: <1503579031-6442-1-git-send-email-jonatan.schlag@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2783430502042586116=="
List-Id: <network.lists.ipfire.org>

--===============2783430502042586116==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit

Hi,

On Thu, 2017-08-24 at 14:50 +0200, Jonatan Schlag wrote:
> Fixes: #11432
> 
> Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
> ---
>  src/functions/functions.ipsec-pool | 9 +++++++++
>  src/network                        | 5 +++++
>  2 files changed, 14 insertions(+)
> 
> diff --git a/src/functions/functions.ipsec-pool
> b/src/functions/functions.ipsec-pool
> index 4eb0e4e..fb7e7da 100644
> --- a/src/functions/functions.ipsec-pool
> +++ b/src/functions/functions.ipsec-pool
> @@ -420,3 +420,12 @@ ipsec_pool_to_strongswan() {
>  		fi
>  	) > ${path}
>  }
> +
> +# List all IPsec pools
> +ipsec_list_pools() {
> +	local pool
> +	for pool in ${NETWORK_IPSEC_POOLS_DIR}/*; do
> +		[ -d ${pool} ] || continue
> +		basename ${pool}
> +	done
> +}

Please use list_directory for this.

And you are again missing the quotes in [ -d ... ].

> diff --git a/src/network b/src/network
> index bc4210c..71b0cde 100644
> --- a/src/network
> +++ b/src/network
> @@ -1154,6 +1154,11 @@ cli_reset() {
>  		ipsec_connection_destroy "${connection}"
>  	done
>  
> +	local pool
> +	for pool in $(ipsec_list_pools); do
> +		ipsec_pool_destroy "${pool}"
> +	done
> +
>  	# Stop strongswan
>  	ipsec_strongswan_autostart
>  

-Michael

--===============2783430502042586116==
Content-Type: application/pgp-signature
Content-Transfer-Encoding: base64
Content-Disposition: attachment; filename="signature.asc"
MIME-Version: 1.0

LS0tLS1CRUdJTiBQR1AgU0lHTkFUVVJFLS0tLS0KCmlRSXpCQUFCQ2dBZEZpRUU1L3JXNWwzR0dl
Mnlwa3R4Z0hudy8yK1FDUWNGQWxtZXpSNEFDZ2tRZ0hudy8yK1EKQ1FmRXdnLy9jOUNtMkFvSnV6
QkRrU2drRGZwVTdydVhzdVBJREdvVWs4ZWJ2dDhqSlhTQW1MM0IwNGJVZUU4dQpxNmlyNzU0THZF
SEwvNVFWMkFkcytXYkdjeXlOOHkrZzYySEVVak8rR0RZTHJRUTFiY09ZZjhOVWtjbldvWEJXCk5B
VW1ZcEVHVXA5QU5uUGpXcmlVM3dYU0xDWklUSXRHVnQxdVZDL1JucEZNcFRhQjZZenhRbnd0cmFp
aUJhVnMKbHlSS3NCUFdZZDZWWVpqaFIzVHAyRlJ6RGNJOEpqVjhSbytYckkvT01ldm42ZWgrcU1O
WldnQVkvbElNMW1UNgpzcmNCY1IvL0VJM3dvUkJFbGgwTWRRWThKTlhKWHl4VDhvbWJxNkxKR3ZQ
KzErWnJ6eVRoWVhwak5HcnpHdmZSCnd4Qm4rYUM2V0duSmY2dnN3MEhwYS92KytmOE96MktWdmtt
eHdLVU14UU5ub2lWZUUxR1ArRUs1WlRiU0d6QTUKUTMyN054c3NxaUZzZkZhNitmaWhaUnQ1QnEx
YkVISXlYbnh6UXk2WmFyUG1sUFN6bGZTbUhycWFxTHc5b1JWdAozaGFYcVVCYXhWTEVaQWw5NXNG
L1pxMEV3eVAvdno4SUZUZ3ZEbGFIKzZxSFMvb1lvRTlJSlBISG1QUFZ3RnF5CmxVQWh1TS9ha0lv
V0RZWGdzVDIzalVlWDBnbTlSUG1qQkhxbGxYbU96WnJUU3dsNE9JdXBjZlFUU1dlcUZvV1kKZzRC
c0lXZ05ORk1zU2hRN2NEWmZlS2czSFB0ODhRRWRONk52dVo4MmFQdnp6V2M0R3ZaaHg0U1U4Q3hT
U3I0YgorSHhpdUdQUC9yMUljSjVSWEVuRkc3ZWMrYUNQODcrYXQvdk5Da0lwZ0M5OURGQTMvcnc9
Cj1FVm90Ci0tLS0tRU5EIFBHUCBTSUdOQVRVUkUtLS0tLQo=

--===============2783430502042586116==--