[v3] sshd-regen-keys: do not enable ssh server if previously disabled

Message ID 20210225074712.31768-1-Quirin.Gylstorff@siemens.com
State Superseded, archived
Headers show
Series [v3] sshd-regen-keys: do not enable ssh server if previously disabled | expand

Commit Message

Quirin Gylstorff Feb. 24, 2021, 9:47 p.m. UTC
From: Quirin Gylstorff <quirin.gylstorff@siemens.com>

The code 'test -n $SSHD_ENABLED' always returns "0" and enables ssh
even if deactivated previously. Adding quotes(") to evaluate the
variable content instead of variable name.

Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
---
Changes V2:
 - add missing space
Changes V#:
 - clarify commit message
meta/recipes-support/sshd-regen-keys/files/sshd-regen-keys.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Henning Schild March 2, 2021, 12:03 a.m. UTC | #1
LGTM, i am always a fan of bumping package versions but that is often
not done. You might want to do that here, but i do not feel strong
about it.

Henning

Am Thu, 25 Feb 2021 08:47:12 +0100
schrieb "[ext] Q. Gylstorff" <Quirin.Gylstorff@siemens.com>:

> From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
> 
> The code 'test -n $SSHD_ENABLED' always returns "0" and enables ssh
> even if deactivated previously. Adding quotes(") to evaluate the
> variable content instead of variable name.
> 
> Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
> ---
> Changes V2:
>  - add missing space
> Changes V#:
>  - clarify commit message
> meta/recipes-support/sshd-regen-keys/files/sshd-regen-keys.sh | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git
> a/meta/recipes-support/sshd-regen-keys/files/sshd-regen-keys.sh
> b/meta/recipes-support/sshd-regen-keys/files/sshd-regen-keys.sh index
> 910d879..50f45eb 100644 ---
> a/meta/recipes-support/sshd-regen-keys/files/sshd-regen-keys.sh +++
> b/meta/recipes-support/sshd-regen-keys/files/sshd-regen-keys.sh @@
> -12,7 +12,7 @@ rm -v /etc/ssh/ssh_host_*_key* echo "Regenerating keys
> ..." dpkg-reconfigure openssh-server 
> -if test -n $SSHD_ENABLED; then
> +if [ -n "$SSHD_ENABLED" ]; then
>      echo "Reenabling ssh server ..."
>      systemctl enable --no-reload ssh
>  fi

Patch

diff --git a/meta/recipes-support/sshd-regen-keys/files/sshd-regen-keys.sh b/meta/recipes-support/sshd-regen-keys/files/sshd-regen-keys.sh
index 910d879..50f45eb 100644
--- a/meta/recipes-support/sshd-regen-keys/files/sshd-regen-keys.sh
+++ b/meta/recipes-support/sshd-regen-keys/files/sshd-regen-keys.sh
@@ -12,7 +12,7 @@  rm -v /etc/ssh/ssh_host_*_key*
 echo "Regenerating keys ..."
 dpkg-reconfigure openssh-server
 
-if test -n $SSHD_ENABLED; then
+if [ -n "$SSHD_ENABLED" ]; then
     echo "Reenabling ssh server ..."
     systemctl enable --no-reload ssh
 fi