Re: /etc/rc.d/iked regression after r1.9

2022-09-04 Thread Antoine Jacoutot
On Sat, Sep 03, 2022 at 11:51:41PM +, Lucas wrote:
> Hello tech@,
> 
> commit r1.9 removed the rc_exec call in iked's rc_pre. Because of that,
> the exit code of rc_pre is that of the && list. In the case of
> sasyncd_flags=NO, this means that rc_pre fails and triggers the break
> in the while true loop in rc_cmd start case. I solved this using the
> same approach as in isakmpd rc file: hardcoding a return 0 afterwards.
> The other alternative is using an if instead of && list, idiom which I
> prefer, but haven't seen much in these files.

Good finding.
Committed, thanks.

> -Lucas
> 
> 
> diff /usr/src
> commit - a300f670c8e17f72646e4eaedfbfeb3ce01a295f
> path + /usr/src
> blob - 8cfb786e6a883c83d4d27de65fb55ce894632cab
> file + etc/rc.d/iked
> --- etc/rc.d/iked
> +++ etc/rc.d/iked
> @@ -15,6 +15,7 @@ rc_configtest() {
>  rc_pre() {
>   [[ ${sasyncd_flags} != NO ]] &&
>   daemon_flags="-S ${daemon_flags}"
> + return 0
>  }
>  
>  rc_cmd $1
> 

-- 
Antoine



/etc/rc.d/iked regression after r1.9

2022-09-03 Thread Lucas
Hello tech@,

commit r1.9 removed the rc_exec call in iked's rc_pre. Because of that,
the exit code of rc_pre is that of the && list. In the case of
sasyncd_flags=NO, this means that rc_pre fails and triggers the break
in the while true loop in rc_cmd start case. I solved this using the
same approach as in isakmpd rc file: hardcoding a return 0 afterwards.
The other alternative is using an if instead of && list, idiom which I
prefer, but haven't seen much in these files.

-Lucas


diff /usr/src
commit - a300f670c8e17f72646e4eaedfbfeb3ce01a295f
path + /usr/src
blob - 8cfb786e6a883c83d4d27de65fb55ce894632cab
file + etc/rc.d/iked
--- etc/rc.d/iked
+++ etc/rc.d/iked
@@ -15,6 +15,7 @@ rc_configtest() {
 rc_pre() {
[[ ${sasyncd_flags} != NO ]] &&
daemon_flags="-S ${daemon_flags}"
+   return 0
 }
 
 rc_cmd $1