summaryrefslogtreecommitdiffstats
path: root/src/main/java/org/openslx/imagemaster/ftp/MasterFtpServer.java
diff options
context:
space:
mode:
authorNils Schwabe2014-06-23 15:12:57 +0200
committerNils Schwabe2014-06-23 15:12:57 +0200
commite37fd784eefe513eda7ab946dcf92b8e8fe1b8a6 (patch)
tree7f7fe48fd392223ee63166467f6342553b2ddc77 /src/main/java/org/openslx/imagemaster/ftp/MasterFtpServer.java
parentForgot thrift file (diff)
downloadmasterserver-e37fd784eefe513eda7ab946dcf92b8e8fe1b8a6.tar.gz
masterserver-e37fd784eefe513eda7ab946dcf92b8e8fe1b8a6.tar.xz
masterserver-e37fd784eefe513eda7ab946dcf92b8e8fe1b8a6.zip
Fix some issues with the ftp connection and the ftp user management
Remove some not needed imports from various files
Diffstat (limited to 'src/main/java/org/openslx/imagemaster/ftp/MasterFtpServer.java')
-rw-r--r--src/main/java/org/openslx/imagemaster/ftp/MasterFtpServer.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/org/openslx/imagemaster/ftp/MasterFtpServer.java b/src/main/java/org/openslx/imagemaster/ftp/MasterFtpServer.java
index dff45b5..c24b318 100644
--- a/src/main/java/org/openslx/imagemaster/ftp/MasterFtpServer.java
+++ b/src/main/java/org/openslx/imagemaster/ftp/MasterFtpServer.java
@@ -211,7 +211,7 @@ public class MasterFtpServer implements Runnable
authorities.add( new WritePermission() );
} else if (mode == Mode.DOWNLOADING) {
// the downloading satellite may access the whole dir, but this is restricted in MasterFtplet
- dir = Globals.getPropertyString( Globals.PropString.FTPBASEDIR );
+ dir = Globals.getPropertyString( Globals.PropString.IMAGEDIR );
// downloading satellite is only allowed to read
file = fileName;
}