lib/php/db.php

diff --git a/etc/profile.d/ldap.sh b/etc/profile.d/ldap.sh
index c75cec2399b42628530916e4ca10a58ce4f2ea0f..ae68e567579c28a7ca2c31a099dc5274e380ab42 100644 (file)
--- a/etc/profile.d/ldap.sh
+++ b/etc/profile.d/ldap.sh
@@ -87,7 +87,7 @@ slapcat_csv() {
     shift
   done
   [ $human = yes ] && slapcat_csv "$aldap" $aawk | csv2human $human_opt && return
-  slapcat -a "$aldap" -o ldif-wrap=no | awk -f $NB_ROOT/lib/awk/ldap2csv.awk -- $aawk
+  slapcat -a "$aldap" -o ldif-wrap=no | grep -v '^entryCSN' | awk -f $NB_ROOT/lib/awk/ldap2csv.awk -- $aawk
 }
 
 ldapsearch_csv() {

diff --git a/lib/php/db.php b/lib/php/db.php
index 22d900c7a0c9a2e65fcfed2404a6382d011ece1b..974ab0d13937925df8c7c665d105acf2740e9004 100644 (file)
--- a/lib/php/db.php
+++ b/lib/php/db.php
@@ -1221,6 +1221,8 @@ class Db extends nb {
     $name = self::p('name','');
     $type = self::p('type','');
 
+    if (empty($this->conf)) return null;
+
     foreach ($this->conf as $id => $attr) {
       $attr['id'] = $id;
       $d = new Db($attr);