Project

General

Profile

Revision 8556

Added by Jing Tao over 5 years ago

Remove code to add the organzation in the search filter. This is not necessary since we use the dn as the search base. The code was not actually used but caused some problem.

View differences:

src/edu/ucsb/nceas/metacat/AuthLdap.java
662 662

  
663 663
			String filter = null;
664 664

  
665
			if (user.indexOf("o=") > 0) {
665
			/*if (user.indexOf("o=") > 0) {
666 666
				String tempStr = user.substring(user.indexOf("o="));
667 667
				filter = "(&(" + user.substring(0, user.indexOf(",")) + ")("
668 668
						+ tempStr.substring(0, tempStr.indexOf(",")) + "))";
669 669
			} else {
670 670
				filter = "(&(" + user.substring(0, user.indexOf(",")) + "))";
671
			}
671
			}*/
672 672
			filter = "(&(" + user.substring(0, user.indexOf(",")) + "))";
673 673

  
674 674
			NamingEnumeration namingEnum = ctx.search(user, filter, ctls);

Also available in: Unified diff