summaryrefslogtreecommitdiffstats
path: root/src/main/java/org/openslx/imagemaster/ftp/MasterFtpServer.java
diff options
context:
space:
mode:
authorNils Schwabe2014-05-07 15:23:26 +0200
committerNils Schwabe2014-05-07 15:23:26 +0200
commitb02181e54011a01df82e4450ae884ebca920a300 (patch)
tree4ed9deb319f6ab2bacaac4cf7333919320949e2c /src/main/java/org/openslx/imagemaster/ftp/MasterFtpServer.java
parentFix message signing (diff)
downloadmasterserver-b02181e54011a01df82e4450ae884ebca920a300.tar.gz
masterserver-b02181e54011a01df82e4450ae884ebca920a300.tar.xz
masterserver-b02181e54011a01df82e4450ae884ebca920a300.zip
Fix bug where the user list was accessed by multiple threads
Add server keys to database
Diffstat (limited to 'src/main/java/org/openslx/imagemaster/ftp/MasterFtpServer.java')
-rw-r--r--src/main/java/org/openslx/imagemaster/ftp/MasterFtpServer.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/main/java/org/openslx/imagemaster/ftp/MasterFtpServer.java b/src/main/java/org/openslx/imagemaster/ftp/MasterFtpServer.java
index 0f5267f..19d8acd 100644
--- a/src/main/java/org/openslx/imagemaster/ftp/MasterFtpServer.java
+++ b/src/main/java/org/openslx/imagemaster/ftp/MasterFtpServer.java
@@ -25,6 +25,7 @@ import org.openslx.imagemaster.Globals;
import org.openslx.imagemaster.Globals.PropString;
import org.openslx.imagemaster.thrift.iface.FtpCredentials;
import org.openslx.imagemaster.util.RandomString;
+import org.openslx.imagemaster.util.Util;
public class MasterFtpServer implements Runnable
{
@@ -136,6 +137,9 @@ public class MasterFtpServer implements Runnable
synchronized ( users ) {
users.remove( username );
}
+ // remove his home dir
+ File dir = new File( Globals.getPropertyString( Globals.PropString.FTPBASEDIR ) + "/" + username );
+ Util.deleteFolder( dir );
return true;
} catch ( FtpException e ) {
return false;