From c640018c2eba2017cdc4092fdebc6bb27794f69a Mon Sep 17 00:00:00 2001 From: Julien Moutinho Date: Thu, 18 Feb 2016 17:08:12 +0100 Subject: [PATCH] Correction : local/dovecot-del-group : restreint la suppression de $domain_group --- etc/gitolite | 2 +- local/dovecot-user-add | 4 ++-- local/dovecot-user-del | 6 +++--- local/roundcube-chpasswd | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/etc/gitolite b/etc/gitolite index c2521db..dc82bba 160000 --- a/etc/gitolite +++ b/etc/gitolite @@ -1 +1 @@ -Subproject commit c2521db16048a5c9a2b0d5810f65d2d17f734fe6 +Subproject commit dc82bbad81e30b02a52732eb07d5a87452c313b0 diff --git a/local/dovecot-user-add b/local/dovecot-user-add index aa79314..e74a110 100755 --- a/local/dovecot-user-add +++ b/local/dovecot-user-add @@ -16,8 +16,8 @@ first_valid_gid=30000 IFS=@ read -r user domain <<-EOF $1 EOF -test "${user:+set"}" -test "${domain:+set"}" +test "${user:+set}" +test "${domain:+set}" shift # setup_nss diff --git a/local/dovecot-user-del b/local/dovecot-user-del index 5e63d32..e078e9d 100755 --- a/local/dovecot-user-del +++ b/local/dovecot-user-del @@ -9,8 +9,8 @@ tool=$(readlink -e "${0%/*}/..") IFS=@ read -r user domain <<-EOF $1 EOF -test "${user:+set"}" -test "${domain:+set"}" +test "${user:+set}" +test "${domain:+set}" shift # setup_postfix @@ -78,8 +78,8 @@ shift getent passwd "$user" then sudo deluser "$user" "$domain_group" + sudo delgroup "$domain_group" fi - sudo delgroup "$domain_group" fi # setup_dirs if test "${purge:+set}" diff --git a/local/roundcube-chpasswd b/local/roundcube-chpasswd index 8dd78ba..96b3a0b 100755 --- a/local/roundcube-chpasswd +++ b/local/roundcube-chpasswd @@ -6,9 +6,9 @@ IFS=: read -r user password IFS=@ read -r user domain <<-EOF $user EOF -test "${user:+set"}" -test "${domain:+set"}" -test "${password:+set"}" +test "${user:+set}" +test "${domain:+set}" +test "${password:+set}" umask 0077 dir_passwd=/etc/dovecot/"$domain" -- 2.20.1