lib/awk/ldap2csv.awk

diff --git a/etc/profile.d/ldap.sh b/etc/profile.d/ldap.sh
index 1dd21da62f7a02f3eacf4f3362be4d57bc771c47..410ea62341cb02bb010e1f62ac52eafbc23fc345 100644 (file)
--- a/etc/profile.d/ldap.sh
+++ b/etc/profile.d/ldap.sh
@@ -75,7 +75,7 @@ ldap_cn() {
 }
 
 ldapsearch_csv() {
-  local filter="$1"; shift
-  #slapcat -a "$filter" -o ldif-wrap=no | awk -F': ' '\
-  ldapsearch -LLLx "$filter" $@ -o ldif-wrap=no | awk -f $NB_ROOT/lib/awk/ldap2csv.awk
+  ldapsearch -LLLx -o ldif-wrap=no $@ | awk -f $NB_ROOT/lib/awk/ldap2csv.awk
+  #local filter="$1"; shift
+  #slapcat -a "$filter" -o ldif-wrap=no | awk -f $NB_ROOT/lib/awk/ldap2csv.awk
 }

diff --git a/lib/awk/ldap2csv.awk b/lib/awk/ldap2csv.awk
index c49134e071675430bdd298677d8a5a677cf94d65..5a65aac569e290d5c6dd6ee411a78fd07debd90f 100644 (file)
--- a/lib/awk/ldap2csv.awk
+++ b/lib/awk/ldap2csv.awk
@@ -1,10 +1,17 @@
 BEGIN {
   FS = ": "
   CONCAT = ";"
+  #h[x] = ""
+  FOUND = 0
+  #delete h
 }
 
 /^$/ {
 
+  if (FOUND == 0) {
+    next
+  }
+
   if (!count) {
     line = ""
     for (i in fields) {
@@ -31,18 +38,21 @@ BEGIN {
   }
 
   sub(/^\t/,"",line)
-  print line"\n"
+  print line
   delete h
-  next
+  FOUND = 0
 
+  next
 }
 
-!/^(objectClass_): / {
+1 && /: / && !/^(objectClass_): / {
 
+  FOUND = 1
   field = $1
   sub(/^.*?: /,"",$0) 
   sub(/\t/,"  ",$0)
   sub(/[ \r\n]+$/,"",$0)
+  #gsub(/\r?\n/,"$",$0)
 
   if (field in h && h[field] != "") {
     h[field] = h[field]""CONCAT""$0