etc/dbq/000-local.php

diff --git a/bin/dbq b/bin/dbq
index 707673d1a0781ff3f8c17a670f32e7182a0a0dbd..95ac9bb17b3736c205202753e6ca27d63cf3a0bd 100755 (executable)
--- a/bin/dbq
+++ b/bin/dbq
@@ -29,7 +29,7 @@ my ($NAME) = $0 =~ m,([^/]+)$,;
 my $UC_NAME = uc($NAME);
 my %PARAM = (
   'format' => $ENV{$UC_NAME.'_FORMAT'} ? $ENV{$UC_NAME.'_FORMAT'} : 'human',
-  'txt_errors' => $ENV{$UC_NAME.'_TXT_ERRORS'} ? $ENV{$UC_NAME.'_TXT_ERRORS'} : '1',
+  'config.txt_errors' => $ENV{$UC_NAME.'_TXT_ERRORS'} ? $ENV{$UC_NAME.'_TXT_ERRORS'} : '1',
   'rows_head_char' => "\r",
 );
 
@@ -193,6 +193,7 @@ if ( $Opt{cut} ) {
   $keys{format} = 'csv';
   $keys{header} = '0' unless defined $keys{header};
 
+} elsif (!defined $keys{format}) {
 } elsif ($keys{format} eq 'nc') {
   $keys{format} = 'csv';
   open(STDOUT,"|$0 --parse_debug|$0 --csv2txt ".( ( defined($keys{header}) ? $keys{header} : '') eq '0' ? '1' : '0'))
@@ -240,6 +241,10 @@ if (-e $url) {
 #################################################################################
 
 warn "$NAME: Command: ",join(" ",map{/\s+/ ? '"'.$_.'"' : $_} grep {!/^rows_head_char=/} @cmd),"\n" if $VERBOSE;
+if ($Opt{debug} and $Opt{debug} > 1) {
+  print STDERR join(' ',@cmd)."\n";
+  exit;
+}
 #use Data::Dumper; warn(Dumper(\@cmd));
 $_ = system(@cmd);
 my $ex = ($? == 0 and $_ == 0) ? 0 : 1;

diff --git a/etc/dbq/000-local.php b/etc/dbq/000-local.php
index d7c24a7592a5fa1353cfbfbf3e0aa1ccc1d00a74..a0c97f6532ee8c368678b495bb721056f98522af 100644 (file)
--- a/etc/dbq/000-local.php
+++ b/etc/dbq/000-local.php
@@ -6,7 +6,7 @@ $DBQ = [
   'nb-sys' => [
     'type' => 'sqlite',
     'name' => 'Sys',
-    'default_table' => 'port',
+    'default_table' => 'mime',
     'host' => nb::ROOT_DIR.'/share/db/sys.db',
   ],
 ];

diff --git a/etc/profile.d/ldap.sh b/etc/profile.d/ldap.sh
index 55ae1ed9de42477b59366e68ea99b4b398099c04..ba995e47321b1897626beee70290d8bc81bb75b8 100644 (file)
--- a/etc/profile.d/ldap.sh
+++ b/etc/profile.d/ldap.sh
@@ -1,11 +1,13 @@
-which ldapsearch > /dev/null || return
+which slapcat > /dev/null || return
 
 ldap_config() {
-  ldapsearch -Q -Y EXTERNAL -H ldapi:/// -o ldif-wrap=999 -b cn=config '(!(objectClass=olcSchemaConfig))'
+# NB 03.11.17   ldapsearch -Q -Y EXTERNAL -H ldapi:/// -o ldif-wrap=999 -b cn=config '(!(objectClass=olcSchemaConfig))'
+  slapcat -b cn=config -a '(!(objectClass=olcSchemaConfig))'
 }
 
 ldap_cn() {
-  ldapsearch -x '(cn=*)' dn | grep ^dn | sed 's/dn: //'
+  #ldapsearch -x '(cn=*)' dn | grep ^dn | sed 's/dn: //'
+  slapcat -a 'cn=*' | grep ^dn | sed 's/dn: //'
 }
 
 ldap_olcdatabases() {
@@ -13,5 +15,6 @@ ldap_olcdatabases() {
 }
 
 ldap_objectclasses() {
-  ldapsearch -x -s base -b "cn=subschema" objectclasses
+# NB 03.11.17   ldapsearch -x -s base -b "cn=subschema" objectclasses
+  slapcat -b cn=config -a '(&(objectClass=olcSchemaConfig))'
 }

diff --git a/lib/php/config.php b/lib/php/config.php
index 12d9e3a629dc1c5792d602dc4b8b24d4c9504cf9..04320913a663ad5a321912063995c42f37547939 100644 (file)
--- a/lib/php/config.php
+++ b/lib/php/config.php
@@ -17,7 +17,7 @@ if (nb::php_cli()) {
   argv2request();
   ini_set('display_errors', true);
   ini_set('log_errors', false);
-  if (nb::p('txt_errors')) ini_set('html_errors', false);
+  if (nb::p('config.txt_errors')) ini_set('html_errors', false);
 }
 
 // Web