From: Nicolas Boisselier <nicolas.boisselier@gmail.com>
Date: Thu, 30 Nov 2017 04:05:41 +0000 (+0000)
Subject: lib/php/db.php
X-Git-Url: https://git.nbdom.net/?a=commitdiff_plain;h=a2d3a15da1119853479ebf7275aee3113ab6c2d8;p=nb.git

lib/php/db.php
---

diff --git a/etc/profile.d/ldap.sh b/etc/profile.d/ldap.sh
index c75cec23..ae68e567 100644
--- 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 22d900c7..974ab0d1 100644
--- 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);