X-Git-Url: https://git.cyclocoop.org/?p=lhc%2Fateliers.git;a=blobdiff_plain;f=local%2Fdovecot-user-add;h=822a690afbdf36740e6c3ded575045395c9ace6a;hp=aa79314369c2c48ac20e2aed78c238e166f8d94c;hb=HEAD;hpb=9075978ae94310fa7a27d9881d3cecc6150ca3e9

diff --git a/local/dovecot-user-add b/local/dovecot-user-add
index aa79314..822a690 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
@@ -161,6 +161,8 @@ shift
 				sudo install -d -o "$uid" -g "$gid" -m 2770 \
 				 "$home" \
 				 "$home"/Maildir
+				sudo install -d -o "$uid" -g "$gid" -m 2770 \
+				 "$home"/Maildir/.Trash
 				sudo install -d -o "$uid" -g "$gid" -m 0700 \
 				 "$home"/acl.d \
 				 "$home"/sieve.d
@@ -177,7 +179,7 @@ shift
 			if test "${welcome_mail:+set}"
 			 then
 				mail \
-				 -S from=postmaster@"$local_domainname" \
+				 -r postmaster@"$local_domainname" \
 				 -s "Bienvenue $user@$domain" \
 				 "$user"@"$domain" <<-EOF
 					Bienvenue $user@$domain,