Index: trunk/ippTools/scripts/ippadmin
===================================================================
--- trunk/ippTools/scripts/ippadmin	(revision 20933)
+++ trunk/ippTools/scripts/ippadmin	(revision 42387)
@@ -6,10 +6,11 @@
 
 if ("$1" == "init") then
-  if ($#argv != 4) goto usage;
+  if ($#argv != 5) goto usage;
   set dbserver = $2
-  set dbuser = $3
-  set dbpass = $4
+  set rootuser = $3
+  set dbuser = $4
+  set dbpass = $5
 
-  mysql -h $dbserver -u root -p <<EOF
+  mysql -h $dbserver -u $rootuser -p <<EOF
   create database $IPPADMIN;
   use $IPPADMIN;
@@ -17,5 +18,33 @@
   create table cookies (cookie_id BIGINT AUTO_INCREMENT, username char(255) not null, cookie varchar(255), primary key (cookie_id));
   create table projects (proj_id BIGINT AUTO_INCREMENT, projname char(255) not null, primary key (proj_id));
-  grant all on *.* to $dbuser@localhost identified by '$dbpass';
+  create user '$dbuser'@'$dbserver' identified by '$dbpass';
+  grant all on *.* to '$dbuser'@'$dbserver';
+  flush privileges;
+EOF
+    exit 0;
+endif
+
+if ("$1" == "project") then
+  if ($#argv != 4) goto usage;
+  set dbserver = $2
+  set dbuser = $3
+  set dbname = $4
+
+  mysql -h $dbserver -u $dbuser -p $IPPADMIN <<EOF
+   insert into projects (projname) values ('$dbname');
+   create database $dbname;
+EOF
+    exit 0;
+endif
+
+if ("$1" == "user") then
+  if ($#argv != 5) goto usage;
+  set dbserver = $2
+  set dbuser = $3
+  set user = $4
+  set pass = $5
+
+  mysql -h $dbserver -u $dbuser -p $IPPADMIN <<EOF
+  insert into users (username, password) values ('$user', '$pass');
 EOF
     exit 0;
@@ -35,72 +64,20 @@
 endif
 
-if ("$1" == "user") then
-  if ($#argv != 5) goto usage;
-  set dbserver = $2
-  set dbuser = $3
-  set user = $4
-  set pass = $5
-
-  mysql -h $dbserver -u $dbuser -p $IPPADMIN <<EOF
-  insert into users (username, password) values ('$user', '$pass');
-EOF
-    exit 0;
-endif
-
-if ("$1" == "project") then
-  if ($#argv != 4) goto usage;
-  set dbserver = $2
-  set dbuser = $3
-  set dbname = $4
-
-  mysql -h $dbserver -u $dbuser -p $IPPADMIN <<EOF
-   insert into projects (projname) values ('$dbname');
-   create database $dbname;
-EOF
-    exit 0;
-endif
-
-if ("$1" == "upgrade") then
-  echo "$#argv"
-  
-  if ($#argv != 3) goto usage;
-  set dbserver = $2
-  set stage = $3
-
-  if ("$stage" == "1") then
-    mysql -h $dbserver -u root -p $IPPADMIN <<EOF
-    ALTER TABLE users add column user_id BIGINT NOT NULL AUTO_INCREMENT FIRST, ADD PRIMARY KEY (user_id);
-    ALTER TABLE users change column username username varchar(255);
-
-    ALTER TABLE cookies add column cookie_id BIGINT AUTO_INCREMENT FIRST, ADD PRIMARY KEY (cookie_id);
-    ALTER TABLE cookies change column username username varchar(255);
-
-    ALTER TABLE projects add column proj_id BIGINT AUTO_INCREMENT FIRST, ADD PRIMARY KEY (proj_id);
-    ALTER TABLE projects change column projname projname varchar(255);
-EOF
-      exit 0;
-  endif
-
-  echo "unknown upgrade stage $stage"
-  exit 1;
-endif
-
 usage:
   echo "USAGE: ippadmin (options)"
   echo ""
-  echo "  ippadmin init (dbserver) (dbuser) (dbpassword)"
-  echo "      creates admin tables, basic db user -- requires root password"
+  echo "  ippadmin init (dbserver) (rootuser) (dbuser) (dbpassword)"
+  echo "      creates admin tables, basic db user -- requires mysql (rootuser) password"
+  echo "      (rootuser) is a mysql user with global privileges"
   echo ""
-  echo "  ippadmin upgrade (dbserver) (stage)"
-  echo "      upgrade existing database for given stage [1] -- requires root password"
+  echo "  ippadmin project (dbserver) (dbuser) (dbname)"
+  echo "      create a new ipp project (database)"
+  echo "      (need to run pxadmin -create after it is created)"
+  echo ""
+  echo "  ippadmin user (dbserver) (dbuser) (username) (password)"
+  echo "      create a new www user and password"
   echo ""
   echo "  ippadmin client (dbserver) (dbuser) (dbpassword) (client)"
   echo "      add client name or regex"
   echo ""
-  echo "  ippadmin user (dbserver) (dbuser) (username) (password)"
-  echo "      create a new www user and password"
-  echo ""
-  echo "  ippadmin project (dbserver) (dbuser) (dbname)"
-  echo "      create a new ipp project (database)"
-  echo ""
   exit 2