--- a/debian/littlebird-tc-sql.config	Wed Aug 31 14:13:15 2011 +0200
+++ b/debian/littlebird-tc-sql.config	Wed Aug 31 16:50:58 2011 +0200
@@ -3,38 +3,28 @@
 . /usr/share/debconf/confmodule
 db_version 2.0
 
+
 prefix=littlebird-tc
-
-myaccess() { mysql -h"$1" -u"$2" -p"$3" -e ""; }
+myaccess_ok() { mysql -h"$1" -u"$2" -p"$3" -e ""; }
 
 
 if test "$1" = "clear"; then
-	db_reset $prefix/db/adminuser
-	db_reset $prefix/db/adminpass
+    for key in db/adminuser db/adminpass
+    do db_reset $prefix/$key; done
 fi
 
-db_settitle littlebird-tc-sql/TITLE
-
+db_settitle $prefix-sql/TITLE
 db_beginblock
-
-	if false; then
-	db_get $prefix/db/host      && host="${RET}"
-	db_get $prefix/db/adminuser && user="${RET}" 
-	db_get $prefix/db/adminpass && pass="${RET}" 
-
-	if test "$user" && test "$pass" \
-		&& myaccess "$host" "$user" "$pass"
-	then
-		echo "DB access as admin is ok" >&2
-	else
-		db_input medium $prefix/db/adminuser
-		db_input medium $prefix/db/adminpass
-	fi
-	fi
-
-	db_input medium $prefix/db/adminuser
-	db_input high   $prefix/db/adminpass
+	db_input medium   $prefix/db/adminuser || true
+	db_input critical $prefix/db/adminpass || true
 db_endblock
 
 db_go || true
-	
+
+db_get $prefix/db/adminpass || true
+if test -z "$RET" ; then
+    db_fset $prefix/db/noadminpass seen false
+    db_input critical $prefix/db/noadminpass || true
+    db_go || true
+    exit 1
+fi