Remove previous change. It was causing problems

diff --git a/Changelog b/Changelog
index 24561c1d2f1e68920df3a4714aec2e4d66e5a4d6..9125c2b766e9110e44ed4e93b6b37d1d71093cd6 100644 (file)
--- 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 d1781d01bff9cc7f3d0f7b23f6057c16d01143f9..937d70cf49ffa42fa0f7cefd1f251005e9f202f1 100644 (file)
--- 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 dafb3f830bf541f0710b96e01a67f41650820a05..d41a4145f2cedf9afa5427b1c8edb39cff2ea891 100644 (file)
--- 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 2a962bf7e3e87342def7da6bb8439cff018ddd82..48dc4a0964e8d38c48a261410a7fb13e0889ee12 100644 (file)
--- 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 48d555b67d78416ee8ade0ce49287ce4a581869f..d64fe0e9ea4162ac204559e6e7541d0f2f5b548b 100644 (file)
--- 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 41363959b1a617a0eba0ef65942f7ea4c33a970b..b104471e653ffdce2078272fb72673fb475a16b9 100644 (file)
--- 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 a2136edcaeca605b3c5b041759a9cec9c8082279..052ab7885d7d748a81bd63e92f9bed61427f0060 100644 (file)
--- 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 185330bc7bf4e25465c6b14c1bd986a6e4f704e9..5c6da52e7634f3d86490ab0929b711034a8d2039 100644 (file)
--- 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 27c25cee23f8cba0ba4d96940d5ddf5ad03a7726..d480bf31d7c319d796a021daf4c1a6f0f13d4d44 100644 (file)
--- 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 3b9d03d5a9a7a03c9f0a5e8f73d668b156494e60..0fae14b8c00c94cc2d66423f1a62874f50059b17 100644 (file)
--- 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 d3d685b3e5d407b2787d14be4813fbb5558500ed..f14ef3dc5e5e5342ba344ca9be833c59b1144750 100644 (file)
--- 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'];