Removed some unneccessary includes, as well as fixing the attribute filtering options for LDAP auth

git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@354 44740490-163a-0410-bde0-09ae8108e29a

config-templates/config.php

@@ -191,12 +191,15 @@ $config = array (
 		),
 
 
-	/*
+	/**
 	 * LDAP configuration. This is only relevant if you use the LDAP authentication plugin.
+	 *
+	 * The attributes parameter is a list of attributes that should be retrieved.
+	 * If the attributes parameter is set to null, all attributes will be retrieved.
 	 */
 	'auth.ldap.dnpattern'  => 'uid=%username%,dc=feide,dc=no,ou=feide,dc=uninett,dc=no',
 	'auth.ldap.hostname'   => 'ldap.uninett.no',
-	'auth.ldap.attributes' => 'objectclass=*',
+	'auth.ldap.attributes' => null,
 	
 	/*
 	 * Radius authentication. This is only relevant if you use the Radius authentication plugin.

lib/SimpleSAML/Auth/LDAP.php

@@ -102,7 +102,7 @@ class SimpleSAML_Auth_LDAP {
 		$searchtxt = (is_array($attributes) ? join(',', $attributes) : 'all attributes');
 		SimpleSAML_Logger::debug('Library - LDAP: Get attributes from ' . $dn . ' (' . $searchtxt . ')');
 		
-		if (is_array($search)) 
+		if (is_array($attributes)) 
 			$sr = @ldap_read($this->ldap, $dn, 'objectClass=*', $attributes );
 		else 
 			$sr = @ldap_read($this->ldap, $dn, 'objectClass=*');

www/auth/login.php

@@ -3,18 +3,13 @@
 
 require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . '../../www/_include.php');
 
-
 require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Utilities.php');
 require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Session.php');
 require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Metadata/MetaDataStorageHandler.php');
-require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/XML/SAML20/AuthnRequest.php');
-require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Bindings/SAML20/HTTPRedirect.php');
 require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/XHTML/Template.php');
 require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Logger.php');
-
 require_once((isset($SIMPLESAML_INCPREFIX)?$SIMPLESAML_INCPREFIX:'') . 'SimpleSAML/Auth/LDAP.php');
 
-
 $config = SimpleSAML_Configuration::getInstance();
 $metadata = SimpleSAML_Metadata_MetaDataStorageHandler::getMetadataHandler();
 $session = SimpleSAML_Session::getInstance(true);
@@ -22,7 +17,6 @@ $session = SimpleSAML_Session::getInstance(true);
 SimpleSAML_Logger::info('AUTH  - ldap: Accessing auth endpoint login');
 
 
-
 $error = null;
 $attributes = array();
 $username = null;