tdraier 2005/08/17 16:31:23 CEST
Modified files:
core/src/java/org/jahia/services/usermanager
JahiaSiteUserManagerDBService.java
Log:
fixed ldap authentication
Revision Changes Path
1.9 +11 -1
jahia/core/src/java/org/jahia/services/usermanager/JahiaSiteUserManagerDBService.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/usermanager/JahiaSiteUserManagerDBService.java.diff?r1=1.8&r2=1.9&f=h
Index: JahiaSiteUserManagerDBService.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/services/usermanager/JahiaSiteUserManagerDBService.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- JahiaSiteUserManagerDBService.java 12 Jul 2005 13:53:03 -0000
1.8
+++ JahiaSiteUserManagerDBService.java 17 Aug 2005 14:31:22 -0000
1.9
@@ -193,7 +193,17 @@
* @return Return the user if not null.
*/
public JahiaUser getMember(int siteID, String username) throws
JahiaException {
- return userManager.getMemberInSite(siteID,username);
+ JahiaUser user = userManager.getMemberInSite(siteID,username);
+ if (user == null) {
+ // user could come from an external service such as LDAP, so we
will look him up directly.
+ if (!"".equals(username)) {
+ user = ServicesRegistry.getInstance().
+ getJahiaUserManagerService().lookupUser(
+ siteID,
+ username);
+ }
+ }
+ return user;
}
/**
