Change username/password for mapsadmin

MariaDB didn't like the long username apparently.

diff --git a/maps/bin/MAPS.pm b/maps/bin/MAPS.pm
index eabe32e..dd7c672 100644 (file)
--- a/maps/bin/MAPS.pm
+++ b/maps/bin/MAPS.pm
@@ -139,8 +139,8 @@ sub UserExists;
 sub Whitelist;
 
 BEGIN {
-  my $MAPS_username = "mapsadmin";
-  my $MAPS_password = "mapsadmin";
+  my $MAPS_username = "maps";
+  my $MAPS_password = "spam";
 
   OpenDB $MAPS_username, $MAPS_password;
 } # BEGIN

diff --git a/maps/bin/MAPSDB.sql b/maps/bin/MAPSDB.sql
index dfe0a4f..1d25810 100644 (file)
--- a/maps/bin/MAPSDB.sql
+++ b/maps/bin/MAPSDB.sql
@@ -89,8 +89,4 @@ create table log (
 
 -- Create users
 grant all privileges 
-  on MAPS.* to mapsadmin@"localhost"  identified by "mapsadmin";
-grant select
-  on MAPS.* to mapsreader@"localhost" identified by "reader";
-grant insert, select, update, delete
-  on MAPS.* to mapswriter@"localhost" identified by "writer";
+  on MAPS.* to maps@"localhost"  identified by "spam";

diff --git a/maps/bin/MAPSDeliver b/maps/bin/MAPSDeliver
index 05ceafd..3921535 100755 (executable)
--- a/maps/bin/MAPSDeliver
+++ b/maps/bin/MAPSDeliver
@@ -64,7 +64,7 @@ die 'Msgfile not specified' unless $msgfile;
 my $err  = DeliverMail $userid, $msgfile;
 
 if ($err) {
-  OpenDB 'mapsadmin', 'mapsadmin';
+  OpenDB 'maps', 'spam';
 
   MAPSDB::SetContext $userid;
 

diff --git a/maps/php/MAPS.php b/maps/php/MAPS.php
index b718935..e676cf4 100755 (executable)
--- a/maps/php/MAPS.php
+++ b/maps/php/MAPS.php
@@ -44,7 +44,7 @@ function DBError($msg, $statement) {
 } // DBError
 
 function OpenDB() {
-  $db = mysql_connect("localhost", "mapsadmin", "mapsadmin")
+  $db = mysql_connect("localhost", "maps", "spam")
     or DBError("OpenDB: Unable to connect to database server", "Connect");
 
   mysql_select_db("MAPS")