From 3cfc25a53829c3121e7ca8190bc8de72e3d7f051 Mon Sep 17 00:00:00 2001
From: Stefan Kangas <stefankangas@gmail.com>
Date: Wed, 5 Jan 2011 15:50:16 +0100
Subject: Fix bugs in adduser

---
 fripost-adduser | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'fripost-adduser')

diff --git a/fripost-adduser b/fripost-adduser
index 1dab56e..f153e67 100755
--- a/fripost-adduser
+++ b/fripost-adduser
@@ -52,7 +52,7 @@ sub read_user_info {
     $user{domain} = $domain;
 
     # Construct maildir from domain and user
-    $user{maildir} = "$domain/$username/Maildir";
+    $user{maildir} = "$domain/$username/Maildir/"; # trailing slash important
 
     # Set dates
     my $now = DateTime->now(
@@ -117,7 +117,8 @@ my ($login,$pass,$uid,$gid) = getpwnam($conf->{maildir_user})
 
 my $maildir_loc = $conf->{maildir_base} . '/' . $user->{maildir};
 
-system(qw/sudo mkdir -p -m/, $conf->{maildir_umask}, $maildir_loc =~ m!(.+)/Maildir$!);
+$maildir_loc =~ m!(.+)/Maildir/$!;
+system(qw/sudo mkdir -p -m/, $conf->{maildir_umask}, $1);
 system(qw/sudo maildirmake/, $maildir_loc);
 system(qw/sudo chmod/, $conf->{maildir_umask}, $maildir_loc);
 system(qw/sudo chown -R/, "$conf->{maildir_user}:$conf->{maildir_group}", $conf->{maildir_base});
-- 
cgit v1.2.3