From 43829638759e5722bf90cef5222a4725f0bbe0ea Mon Sep 17 00:00:00 2001
From: Scott Ullrich <sullrich@pfsense.org>
Date: Sun, 3 Feb 2008 01:47:48 +0000
Subject: * Remove trailing blank line * Make sure $search has data before
 operating on it

---
 etc/inc/auth.inc    | 12 ++++++------
 etc/inc/authgui.inc |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'etc/inc')

diff --git a/etc/inc/auth.inc b/etc/inc/auth.inc
index 262e8ab..12c9635 100644
--- a/etc/inc/auth.inc
+++ b/etc/inc/auth.inc
@@ -826,18 +826,18 @@ function ldap_get_groups($username) {
 		return $status;	
 	}
 
-
-        log_error("LDAPGroupAttribute ===== {$ldapgroupattribute}");
+    log_error("LDAPGroupAttribute ===== {$ldapgroupattribute}");
 	$search = ldap_search($ldap, $ldapauthcontainers, $ldapfilter, array($ldapgroupattribute));
 
-	$info = ldap_get_entries($ldap, $search);
-        $countem = $info["count"];	
+	if($search) {
+		$info = ldap_get_entries($ldap, $search);
+    	$countem = $info["count"];	
+	}
 	$memberof = array();
 	
-        log_error("USER HAS {$countem} LDAP Groups it is {$info[0][$ldapgroupattribute][0]}");
+	log_error("USER HAS {$countem} LDAP Groups it is {$info[0][$ldapgroupattribute][0]}");
 
 	if(is_array($info[0][$ldapgroupattribute])) {
-
     	foreach($info[0][$ldapgroupattribute] as $member) {
     	   //$member = strtoupper($member);
     	   log_error("MEMBER===={$member}");
diff --git a/etc/inc/authgui.inc b/etc/inc/authgui.inc
index 692e070..0df0206 100644
--- a/etc/inc/authgui.inc
+++ b/etc/inc/authgui.inc
@@ -322,4 +322,4 @@ function display_login_form() {
 <?php
 } // end function
 
-?>
+?>
\ No newline at end of file
-- 
cgit v1.1