Project

General

Profile

« Previous | Next » 

Revision 4159

Added by daigle almost 16 years ago

Add support for separate LDAP and organization level configurations

View differences:

AuthAdmin.java
36 36 
import org.apache.log4j.Logger;
37 37 

  		




  38
  38
  
    
import edu.ucsb.nceas.metacat.util.LDAPUtil;


  		




  
  39
  
    
import edu.ucsb.nceas.metacat.util.OrganizationUtil;


  		




  39
  40
  
    
import edu.ucsb.nceas.metacat.util.RequestUtil;


  		




  40
  41
  
    
import edu.ucsb.nceas.metacat.util.UtilException;


  		




  41
  42
  
    

  		




  ......




  117
  118
  
    
				validationErrors.addAll(validateOptions(request));


  		




  118
  119
  
    
				


  		




  119
  120
  
    
				if (validationErrors.size() == 0) {


  		




  120
  
  
    
					Vector<String> dnList = LDAPUtil.getOrgDNs(organization);


  		




  
  121
  
    
					Vector<String> dnList = OrganizationUtil.getOrgDNs(organization);


  		




  121
  122
  
    
					isLoggedIn = LDAPUtil.logUserIn(request, userName, organization, dnList, password);


  		




  122
  123
  
    
					loginString = LDAPUtil.createLDAPString(userName, organization, dnList);


  		




  123
  124
  
    
				}


  		












Also available in:  Unified diff