summaryrefslogtreecommitdiffstats
path: root/src/main/java/org/openslx/imagemaster/db/LdapUser.java
diff options
context:
space:
mode:
authorSimon Rettberg2014-10-02 18:50:15 +0200
committerSimon Rettberg2014-10-02 18:50:15 +0200
commit397af7dbf782e39809b78074699c3a125412e62f (patch)
tree8276806175cb73a476436fe1228cae080bac95c4 /src/main/java/org/openslx/imagemaster/db/LdapUser.java
parentMerge branch 'master' of dnbd3:bwlp/masterserver (diff)
downloadmasterserver-397af7dbf782e39809b78074699c3a125412e62f.tar.gz
masterserver-397af7dbf782e39809b78074699c3a125412e62f.tar.xz
masterserver-397af7dbf782e39809b78074699c3a125412e62f.zip
Implement API methods getPublicImages, getOrganizations
Diffstat (limited to 'src/main/java/org/openslx/imagemaster/db/LdapUser.java')
-rw-r--r--src/main/java/org/openslx/imagemaster/db/LdapUser.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/org/openslx/imagemaster/db/LdapUser.java b/src/main/java/org/openslx/imagemaster/db/LdapUser.java
index b026e7e..988f43a 100644
--- a/src/main/java/org/openslx/imagemaster/db/LdapUser.java
+++ b/src/main/java/org/openslx/imagemaster/db/LdapUser.java
@@ -150,7 +150,7 @@ public class LdapUser extends User
/**
* Login user locally if external Ldap server is not available
- * @param eppn Must be in form "username@organization"
+ * @param login Must be in form "username@organization"
* @param password The user's password
*/
private static LdapUser localLogin( String login, String password )
@@ -162,7 +162,7 @@ public class LdapUser extends User
if (!Sha512Crypt.verifyPassword( password, user.password )) return null;
// return ldapuser if valid
- return new LdapUser( user.userId, user.eppn, Sha512Crypt.Sha512_crypt( password, null, 0 ), user.organizationId, user.firstName,
+ return new LdapUser( user.userId, user.login, Sha512Crypt.Sha512_crypt( password, null, 0 ), user.organizationId, user.firstName,
user.lastName, user.eMail, user.satelliteAddress );
}
}