From c275221338b3e7c029335ec95fa66887cdaa7c68 Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Tue, 20 May 2003 19:25:06 +0000
Subject: Avoid passwords.

---
 localaddmysqldb | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

(limited to 'localaddmysqldb')

diff --git a/localaddmysqldb b/localaddmysqldb
index 8385e8c..282a6fa 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.3 2003-05-19 23:45:56 jonas Exp $
+# $Id: localaddmysqldb,v 1.4 2003-05-20 19:25:06 jonas Exp $
 #
 # Add/update MySQL database
 #
@@ -131,7 +131,7 @@ for boolean in $optsboolean; do
 done
 setopts $opts1
 setopts $opts2
-optdbserver="-p$dbserver"
+optdbserver="-h$dbserver"
 if [ "$dbserver" = "localhost" ]; then
 	optdbserver="" # Do not force TCP/IP access when connecting locally
 fi
@@ -183,7 +183,7 @@ if [ -z "$dbadmpass" ]; then
 		exit 1
 	fi
 fi
-alldb=`mysql -u$dbadmin -p$dbadmpass $optdbserver mysql -e "show databases;" | grep -v '^Database$'`
+alldb=`mysql -u$dbadmin $optdbserver mysql -e "show databases;" | grep -v '^Database$'`
 
 ##############################################
 # The rest of the script is dbname-specific... #
@@ -225,7 +225,7 @@ if [ -n "$error" ]; then
 				exit 1
 			fi
 		else
-			mysql -u$dbadmin -p$dbadmpass $optdbserver -f -e "DROP DATABASE $dbname;"
+			mysql -u$dbadmin $optdbserver -f -e "DROP DATABASE $dbname;"
 		fi
 	else
 		echo "ERROR: $error!"
@@ -247,7 +247,7 @@ if [ -e /usr/share/wwwconfig-common/mysql-createdb.sh ] ; then
 	fi
 else
 	# TODO: Purge existing database as the wwwconfig-common script does
-	mysql -u$dbadmin -p$dbadmpass $optdbserver -e "CREATE DATABASE $dbname;"
+	mysql -u$dbadmin $optdbserver -e "CREATE DATABASE $dbname;"
 fi
 
 if [ -n "$verbose" ]; then
@@ -261,18 +261,16 @@ if [ -e /usr/share/wwwconfig-common/mysql-createuser.sh ] ; then
 		exit 1
 	fi
 	for h in `echo "localhost $dballow" | sort -u`; do
-#		mysql -u$dbadmin -p$dbadmpass $optdbserver mysql -e "GRANT INDEX ON $dbname.* TO '$dbuser'@'$h';"
-		mysql -u$dbadmin -p$dbadmpass $optdbserver mysql -e "REVOKE CREATE,DROP ON $dbname.* FROM '$dbuser'@'$h';"
+		mysql -u$dbadmin $optdbserver mysql -e "REVOKE CREATE,DROP ON $dbname.* FROM '$dbuser'@'$h';"
 	done
 else
 	for h in `echo "localhost $dballow" | sort -u`; do
-#		mysql -u$dbadmin -p$dbadmpass $optdbserver mysql -e "GRANT SELECT,INSERT,UPDATE,DELETE,CREATE,DROP,INDEX ON $dbname.* TO '$dbuser'@'$h' IDENTIFIED BY '$dbpass';"
-		mysql -u$dbadmin -p$dbadmpass $optdbserver mysql -e "GRANT SELECT,INSERT,UPDATE,DELETE ON $dbname.* TO '$dbuser'@'$h' IDENTIFIED BY '$dbpass';"
+		mysql -u$dbadmin $optdbserver mysql -e "GRANT SELECT,INSERT,UPDATE,DELETE ON $dbname.* TO '$dbuser'@'$h' IDENTIFIED BY '$dbpass';"
 	done
 fi
 
 for h in `echo "localhost $dballow" | sort -u`; do
-	mysql -u$dbadmin -p$dbadmpass $optdbserver mysql -e "GRANT SELECT,INSERT,UPDATE,DELETE,CREATE,DROP,INDEX ON $dbname.* TO '$dbuser-admin'@'$h' IDENTIFIED BY '$dbpass';"
+	mysql -u$dbadmin $optdbserver mysql -e "GRANT SELECT,INSERT,UPDATE,DELETE,CREATE,DROP,INDEX ON $dbname.* TO '$dbuser-admin'@'$h' IDENTIFIED BY '$dbpass';"
 done
 
 done
-- 
cgit v1.2.3