From e6292cc021a9f55cfff8ddeb886c529636c6f09b Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Mon, 20 Oct 2003 15:03:11 +0000
Subject: Treat failed db user as a warning only (and in fact the failure may
 be bogus -  wwwconfig-common is buggy).

---
 localaddmysqldb | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'localaddmysqldb')

diff --git a/localaddmysqldb b/localaddmysqldb
index dbf94fc..1b7cc3f 100755
--- a/localaddmysqldb
+++ b/localaddmysqldb
@@ -3,7 +3,7 @@
 # /usr/local/sbin/localaddmysqldb
 # Copyright 2001-2002 Jonas Smedegaard <dr@jones.dk>
 #
-# $Id: localaddmysqldb,v 1.7 2003-05-26 17:09:18 jonas Exp $
+# $Id: localaddmysqldb,v 1.8 2003-10-20 15:03:11 jonas Exp $
 #
 # Add/update MySQL database
 #
@@ -226,16 +226,16 @@ if [ -n "$error" ]; then
 		esac
 	fi
 	if [ -n "$force" ]; then
-		if [ -e /usr/share/wwwconfig-common/mysql-dropdb.sh ] ; then
-			status=""
-			. /usr/share/wwwconfig-common/mysql-dropdb.sh
-			if [ "$status" = "error" ] ; then
-				echo "$error"
-				exit 1
-			fi
-		else
+#		if [ -e /usr/share/wwwconfig-common/mysql-dropdb.sh ] ; then
+#			status=""
+#			. /usr/share/wwwconfig-common/mysql-dropdb.sh
+#			if [ "$status" = "error" ] ; then
+#				echo "$error"
+#				exit 1
+#			fi
+#		else
 			mysql -u$dbadmin $optdbserver -f -e "DROP DATABASE $dbname;"
-		fi
+#		fi
 	else
 		echo "ERROR: $error!"
 		exit 1
@@ -267,7 +267,7 @@ if [ -e /usr/share/wwwconfig-common/mysql-createuser.sh ] ; then
 	. /usr/share/wwwconfig-common/mysql-createuser.sh
 	if [ "$status" = "error" ] ; then
 		echo "$error"
-		exit 1
+#		exit 1
 	fi
 	for h in `echo "localhost $dballow" | sort -u`; do
 		mysql -u$dbadmin $optdbserver mysql -e "REVOKE CREATE,DROP ON $dbname.* FROM '$dbuser'@'$h';"
-- 
cgit v1.2.3