From 7fd88fef131326a259b02d9b0b7d10f79172e79c Mon Sep 17 00:00:00 2001
From: Angelo Naselli <anaselli@linux.it>
Date: Thu, 7 Aug 2014 13:30:20 +0200
Subject: Fixed home creation if home already exists (crashed in userdrake)

---
 lib/AdminPanel/Module/Users.pm | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'lib/AdminPanel/Module/Users.pm')

diff --git a/lib/AdminPanel/Module/Users.pm b/lib/AdminPanel/Module/Users.pm
index c937cd5a..33d2ade1 100644
--- a/lib/AdminPanel/Module/Users.pm
+++ b/lib/AdminPanel/Module/Users.pm
@@ -988,9 +988,15 @@ sub addUserDialog {
                 }
                 my $userEnt = $continue && $self->ctx->InitUser($username, $is_system);
                 if ($continue && $createHome->value()) {
-                    $dontcreatehomedir = 0;
                     my $homedir = $homeDir->value();
-                    $userEnt and $userEnt->HomeDir($homedir);
+                    if ( -d $homedir) {
+                        $errorString = $self->loc->N("Home directory <%s> already exists.\nPlease uncheck the home creation option, or change the directory path name", $homedir);
+                        $continue = 0;
+                    }
+                    else {
+                        $dontcreatehomedir = 0;
+                        $userEnt and $userEnt->HomeDir($homedir);
+                    }
                 } else {
                     $dontcreatehomedir = 1;
                 }
-- 
cgit v1.2.1