diff options
| author | Nils Schwabe | 2014-06-19 15:39:46 +0200 |
|---|---|---|
| committer | Nils Schwabe | 2014-06-19 15:39:46 +0200 |
| commit | 3883dfc25cbde35afe09e135c9be820f75a7b616 (patch) | |
| tree | 755ac7ae6b331403845b25f3db6cb91922ea2990 /src | |
| parent | Fix problems with thrift connection (diff) | |
| download | masterserver-3883dfc25cbde35afe09e135c9be820f75a7b616.tar.gz masterserver-3883dfc25cbde35afe09e135c9be820f75a7b616.tar.xz masterserver-3883dfc25cbde35afe09e135c9be820f75a7b616.zip | |
Add image path into ftpCredentials
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/org/openslx/imagemaster/ftp/MasterFtpServer.java | 2 | ||||
| -rw-r--r-- | src/main/thrift/imagemaster.thrift | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/main/java/org/openslx/imagemaster/ftp/MasterFtpServer.java b/src/main/java/org/openslx/imagemaster/ftp/MasterFtpServer.java index 3da37a0..dff45b5 100644 --- a/src/main/java/org/openslx/imagemaster/ftp/MasterFtpServer.java +++ b/src/main/java/org/openslx/imagemaster/ftp/MasterFtpServer.java @@ -221,7 +221,7 @@ public class MasterFtpServer implements Runnable try { userManager.save( user ); - ftpCredentials = new FtpCredentials( generatedUser, generatedPass ); + ftpCredentials = new FtpCredentials( generatedUser, generatedPass, fileName ); synchronized ( users ) { users.put( ftpCredentials.username, new Infos( System.currentTimeMillis(), mode, file, serverSessionId) ); DbFtpUser.addUser( new DbFtpUser( generatedUser, generatedPass, mode.toString(), fileName, serverSessionId, new Timestamp(System.currentTimeMillis()) ) ); diff --git a/src/main/thrift/imagemaster.thrift b/src/main/thrift/imagemaster.thrift index 26001da..eb80970 100644 --- a/src/main/thrift/imagemaster.thrift +++ b/src/main/thrift/imagemaster.thrift @@ -72,7 +72,8 @@ struct SessionData { struct FtpCredentials { 1: string username, - 2: string password + 2: string password, + 3: string filename } struct ServerSessionData { |