From: Razvan Becheriu <razvan.becheriu@qualitance.com>
Date: Mon, 30 May 2016 10:40:40 +0000 (+0300)
Subject: fixed kea-admin dscsql lease-init script
X-Git-Tag: trac4283_base~25
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=11aedc9ce14e886437870fbbf765c46b5cfe0bff;p=thirdparty%2Fkea.git

fixed kea-admin dscsql lease-init script
---

diff --git a/src/bin/admin/kea-admin.in b/src/bin/admin/kea-admin.in
index 8e74be3f84..0323fb635e 100644
--- a/src/bin/admin/kea-admin.in
+++ b/src/bin/admin/kea-admin.in
@@ -217,11 +217,11 @@ dscsql_init() {
         exit 1
     fi
 
-    COUNT=`echo $RESULT | grep $db_name | wc -w`
+    COUNT=`echo $RESULT | tr " " "\n" | grep $db_name | wc -w`
     if [ $COUNT -gt 0 ]; then
         # Let't start with a new line. cqlsh could have printed something out.
         printf "\n"
-        log_error "Expected empty database $db_name, but there are $COUNT tables: \n$RESULT. Aborting."
+        log_error "Expected no database $db_name, but there are $COUNT databases: \n$RESULT. Aborting."
         exit 1
     fi