From 547a6d11a1522ff11977ca320700f65f4b3e3c20 Mon Sep 17 00:00:00 2001
From: kkalev <kkalev>
Date: Mon, 9 Sep 2002 08:06:31 +0000
Subject: [PATCH] Remove previous change. It was causing problems

---
 Changelog                    | 1 +
 lib/ldap/change_attrs.php3   | 6 ++----
 lib/ldap/change_info.php3    | 6 ++----
 lib/ldap/change_passwd.php3  | 6 ++----
 lib/ldap/create_user.php3    | 6 ++----
 lib/ldap/defaults.php3       | 6 ++----
 lib/ldap/delete_user.php3    | 6 ++----
 lib/ldap/find.php3           | 6 ++----
 lib/ldap/functions.php3      | 6 ++----
 lib/ldap/password_check.php3 | 3 +--
 lib/ldap/user_info.php3      | 6 ++----
 11 files changed, 20 insertions(+), 38 deletions(-)

diff --git a/Changelog b/Changelog
index 24561c1..9125c2b 100644
--- a/Changelog
+++ b/Changelog
@@ -45,6 +45,7 @@ Ver 1.59:
 * Also cache the default.vals file.
 * Update documentation
 * Only connect and bind to the ldap server if we haven't done that before.
+* Remove previous change. It was causing problems
 Ver 1.55:
 * Update the FAQ about missing attributes from the user/group edit pages and add a few comments
   in the configuration files
diff --git a/lib/ldap/change_attrs.php3 b/lib/ldap/change_attrs.php3
index d1781d0..937d70c 100644
--- a/lib/ldap/change_attrs.php3
+++ b/lib/ldap/change_attrs.php3
@@ -1,10 +1,8 @@
 <?php
 require_once('../lib/ldap/functions.php3');
-	if (!isset($ds))
-		$ds = @ldap_connect($config[ldap_server]);
+	$ds = @ldap_connect($config[ldap_server]);
 	if ($ds){
-		if (!isset($r))
-			$r = @da_ldap_bind($ds,$config);
+		$r = @da_ldap_bind($ds,$config);
 		if ($r){
 
 			foreach($show_attrs as $key => $attr){
diff --git a/lib/ldap/change_info.php3 b/lib/ldap/change_info.php3
index dafb3f8..d41a414 100644
--- a/lib/ldap/change_info.php3
+++ b/lib/ldap/change_info.php3
@@ -1,10 +1,8 @@
 <?php
 require_once('../lib/ldap/functions.php3');
-	if (!isset($ds))
-		$ds = @ldap_connect($config[ldap_server]);
+	$ds = @ldap_connect($config[ldap_server]);
 	if ($ds){
-		if (!isset($r))
-			$r = @da_ldap_bind($ds,$config);
+		$r = @da_ldap_bind($ds,$config);
 		if ($r){
 			if ($Fcn != '' && $Fcn != '-' && $Fcn != $cn)
 				$mod['cn'] = $Fcn;
diff --git a/lib/ldap/change_passwd.php3 b/lib/ldap/change_passwd.php3
index 2a962bf..48dc4a0 100644
--- a/lib/ldap/change_passwd.php3
+++ b/lib/ldap/change_passwd.php3
@@ -1,10 +1,8 @@
 <?php
 require_once('../lib/ldap/functions.php3');
-	if (!isset($ds))
-		$ds = @ldap_connect($config[ldap_server]);
+	$ds = @ldap_connect($config[ldap_server]);
 	if ($ds){
-		if (!isset($r))
-			$r = @da_ldap_bind($ds,$config);
+		$r = @da_ldap_bind($ds,$config);
 		if ($r){
 			if (is_file("../lib/crypt/$config[general_encryption_method].php3")){
 				include("../lib/crypt/$config[general_encryption_method].php3");
diff --git a/lib/ldap/create_user.php3 b/lib/ldap/create_user.php3
index 48d555b..d64fe0e 100644
--- a/lib/ldap/create_user.php3
+++ b/lib/ldap/create_user.php3
@@ -1,10 +1,8 @@
 <?php
 require_once('../lib/ldap/functions.php3');
-	if (!isset($ds))
-		$ds = @ldap_connect($config[ldap_server]);
+	$ds = @ldap_connect($config[ldap_server]);
 	if ($ds){
-		if (!isset($r))
-			$r = @da_ldap_bind($ds,$config);
+		$r = @da_ldap_bind($ds,$config);
 		if ($r){
 			list ($givenname,$sn) = split(' ',$Fcn,3);
 			$dn = 'uid=' . $login . ',' . $config[ldap_default_new_entry_suffix];
diff --git a/lib/ldap/defaults.php3 b/lib/ldap/defaults.php3
index 4136395..b104471 100644
--- a/lib/ldap/defaults.php3
+++ b/lib/ldap/defaults.php3
@@ -3,11 +3,9 @@ require_once('../lib/ldap/functions.php3');
 if ($config[ldap_default_dn] != ''){
 	include('../lib/ldap/attrmap.php3');
 	$regular_profile_attr = $config[ldap_regular_profile_attr];
-	if (!isset($ds))
-		$ds=@ldap_connect("$config[ldap_server]");  // must be a valid ldap server!
+	$ds=@ldap_connect("$config[ldap_server]");  // must be a valid ldap server!
 	if ($ds) {
-		if (!isset($r))
-       			$r=@da_ldap_bind($ds,$config);
+		$r=@da_ldap_bind($ds,$config);
        		$sr=@ldap_search($ds,"$config[ldap_default_dn]", 'objectclass=*');
        		if ($info = @ldap_get_entries($ds, $sr)){
        			$dn = $info[0]['dn'];
diff --git a/lib/ldap/delete_user.php3 b/lib/ldap/delete_user.php3
index a2136ed..052ab78 100644
--- a/lib/ldap/delete_user.php3
+++ b/lib/ldap/delete_user.php3
@@ -1,10 +1,8 @@
 <?php
 require_once('../lib/ldap/functions.php3');
-if (!isset($ds))
-	$ds = @ldap_connect($config[ldap_server]);
+$ds = @ldap_connect($config[ldap_server]);
 if ($ds){
-	if (!isset($r))
-		$r = @da_ldap_bind($ds,$config);
+	$r = @da_ldap_bind($ds,$config);
 	if ($r){
 		@ldap_delete($ds,$dn);
 		if (@ldap_error($ds) == 'Success')
diff --git a/lib/ldap/find.php3 b/lib/ldap/find.php3
index 185330b..5c6da52 100644
--- a/lib/ldap/find.php3
+++ b/lib/ldap/find.php3
@@ -1,10 +1,8 @@
 <?php
 require_once('../lib/ldap/functions.php3');
-if (!isset($ds))
-	$ds=@ldap_connect("$config[ldap_server]");  // must be a valid ldap server!
+$ds=@ldap_connect("$config[ldap_server]");  // must be a valid ldap server!
 if ($ds) {
-	if (!isset($r))
-		$r=@da_ldap_bind($ds,$config);
+	$r=@da_ldap_bind($ds,$config);
 	if ($search_IN == 'name' || $search_IN == 'ou')
 		$attr = ($search_IN == 'name') ? 'cn' : 'ou';
 	else if ($search_IN == 'radius'){
diff --git a/lib/ldap/functions.php3 b/lib/ldap/functions.php3
index 27c25ce..d480bf3 100644
--- a/lib/ldap/functions.php3
+++ b/lib/ldap/functions.php3
@@ -29,11 +29,9 @@ function da_ldap_bind($ds,$config)
 
 function connect2db($config)
 {
-	if (!isset($ds))
-		$ds=@ldap_connect("$config[ldap_server]");  // must be a valid ldap server!
+	$ds=@ldap_connect("$config[ldap_server]");  // must be a valid ldap server!
 	if ($ds)
-		if (!isset($r))
-			$r=@da_ldap_bind($ds,$config);
+		$r=@da_ldap_bind($ds,$config);
 	return $ds;
 }
 
diff --git a/lib/ldap/password_check.php3 b/lib/ldap/password_check.php3
index 3b9d03d..0fae14b 100644
--- a/lib/ldap/password_check.php3
+++ b/lib/ldap/password_check.php3
@@ -1,8 +1,7 @@
 <?php
 
 if ($action == 'checkpass'){
-	if (!isset($ds))
-		$ds=@ldap_connect("$config[ldap_server]");  // must be a valid ldap server!
+	$ds=@ldap_connect("$config[ldap_server]");  // must be a valid ldap server!
 	if ($ds){
 		if ($dn != ''){
 			if ($passwd == '')
diff --git a/lib/ldap/user_info.php3 b/lib/ldap/user_info.php3
index d3d685b..f14ef3d 100644
--- a/lib/ldap/user_info.php3
+++ b/lib/ldap/user_info.php3
@@ -24,11 +24,9 @@ $mobile = '-';
 $mail = '-';
 $mailalt = '-';
 
-if (!isset($ds))
-	$ds=@ldap_connect("$config[ldap_server]");  // must be a valid ldap server!
+$ds=@ldap_connect("$config[ldap_server]");  // must be a valid ldap server!
 if ($ds) {
-	if (!isset($r))
-		$r=@da_ldap_bind($ds,$config);
+	$r=@da_ldap_bind($ds,$config);
 	$sr=@ldap_search($ds,"$config[ldap_base]", 'uid=' . $login);
 	$info = @ldap_get_entries($ds, $sr);
 	$dn = $info[0]['dn'];
-- 
2.39.5