summaryrefslogtreecommitdiffstats
path: root/src/main/java/org/openslx/imagemaster/db/LDAPUser.java
diff options
context:
space:
mode:
authorNils Schwabe2014-04-11 12:09:58 +0200
committerNils Schwabe2014-04-11 12:09:58 +0200
commit7e776645ecd93190221b188b3c1c3de749fb03a7 (patch)
tree1730cbe9d06a56e3f3005558d4ed064d4169aff3 /src/main/java/org/openslx/imagemaster/db/LDAPUser.java
parentAdded some functionallity to the ImageProcessor. (diff)
downloadmasterserver-7e776645ecd93190221b188b3c1c3de749fb03a7.tar.gz
masterserver-7e776645ecd93190221b188b3c1c3de749fb03a7.tar.xz
masterserver-7e776645ecd93190221b188b3c1c3de749fb03a7.zip
added connection to image database
--> images are now processed after ftp upload --> image is moved to image_dir --> DB is updated with imageData
Diffstat (limited to 'src/main/java/org/openslx/imagemaster/db/LDAPUser.java')
-rw-r--r--src/main/java/org/openslx/imagemaster/db/LDAPUser.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/org/openslx/imagemaster/db/LDAPUser.java b/src/main/java/org/openslx/imagemaster/db/LDAPUser.java
index 1034116..2d17b08 100644
--- a/src/main/java/org/openslx/imagemaster/db/LDAPUser.java
+++ b/src/main/java/org/openslx/imagemaster/db/LDAPUser.java
@@ -39,10 +39,10 @@ class MyTrustManager implements X509TrustManager {
public class LDAPUser extends User {
- protected LDAPUser(String username, String password, String organization,
+ protected LDAPUser(int userId, String username, String password, String organization,
String firstName, String lastName, String eMail,
String satelliteAddress) {
- super(username, password, organization, firstName, lastName, eMail,
+ super(userId, username, password, organization, firstName, lastName, eMail,
satelliteAddress);
}
@@ -129,6 +129,6 @@ public class LDAPUser extends User {
return null;
}
}
- return new LDAPUser(username, Sha512Crypt.Sha512_crypt(password, null, 0), organization, firstName, lastName, eMail, satelliteAddress);
+ return new LDAPUser(0, username, Sha512Crypt.Sha512_crypt(password, null, 0), organization, firstName, lastName, eMail, satelliteAddress);
}
}