[Pkg-mysql-commits] r1189 - trunk/debian

[Norbert Tretkowski]

tags 471887 pending
thanks

Author: nobse
Date: 2008-03-30 18:21:06 +0000 (Sun, 30 Mar 2008)
New Revision: 1189

Modified:
   trunk/debian/changelog
   trunk/debian/mysql-server-5.0.config
   trunk/debian/mysql-server-5.0.templates
Log:
Confirm password on install.

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2008-03-30 02:41:28 UTC (rev 1188)
+++ trunk/debian/changelog	2008-03-30 18:21:06 UTC (rev 1189)
@@ -2,31 +2,34 @@
 
   [ Monty Taylor ]
   * Add Sphinx SE integration.
-  * Remove build of ndb docs, since they are not installed. Removed build
-    deps on TeX and doxygen since that's all they were there for.
+  * Remove build of ndb docs, since they are not installed. Removed build deps
+    on TeX and doxygen since that's all they were there for.
   * Replace script in check_for_crashed_tables with a myisam-recover option
     and a script to trigger a check of those tables. (thanks HarrisonF and
     kolbe)
   * Replace direct calls to test suite with calls to the make targets used by
     the MySQL build and qa teams for releases.
   * Add information about Sphinx to README.Maintainer.
-  * Added --skip-ndbcluster to the postinst bootstrap command. It's really a
-    workaround for a bug in 5.1, but it's probably a good idea anyway since
-    we certainly don't need cluster to spin up, and if people have enabled
+
+  * Add --skip-ndbcluster to the postinst bootstrap command. It's really a
+    workaround for a bug in 5.1, but it's probably a good idea anyway since we
+    certainly don't need cluster to spin up, and if people have enabled
     cluster in their my.cnf file, there could be postinst issues if cluster
     isn't running.
-  * Added myself to uploaders.
+  * Add myself to uploaders.
 
   [ Norbert Tretkowski ]
   * New patch 56_fix_order_by.dpatch from Ubuntu to fix ORDER BY not working
     with GROUP BY. (closes: #471737)
   * Add note about filename extensions in the /etc/mysql/conf.d/ directory in
     my.cnf. (closes: #461759)
+  * Confirm password on install, patch from Nicolas Valcárcel.
+    (closes: #471887)
   * Remove Adam Conrad from uploaders on his request. Thanks for your work in
     the past!
   * Use lsb_release to detect distribution.
 
- -- Monty Taylor <mordred at inaugust.com>  Sun, 30 Mar 2008 04:40:12 +0200
+ -- Norbert Tretkowski <nobse at debian.org>  Sun, 30 Mar 2008 20:17:13 +0200
 
 mysql-dfsg-5.0 (5.0.51a-3) unstable; urgency=low
 

Modified: trunk/debian/mysql-server-5.0.config
===================================================================
--- trunk/debian/mysql-server-5.0.config	2008-03-30 02:41:28 UTC (rev 1188)
+++ trunk/debian/mysql-server-5.0.config	2008-03-30 18:21:06 UTC (rev 1189)
@@ -17,8 +17,31 @@
 # there is also an additional check for empty root passwords in the
 # postinst script when the tools are available for us to use.
 if [ "$1" = "configure" ] && [ -z "$2" ] || [ "$1" = "reconfigure" ]; then
-	db_input high mysql-server/root_password || true
-	db_go
+  while :; do
+    RET=""
+    db_input medium mysql-server/root_password || true
+    db_go
+    db_get mysql-server/root_password
+    # if password isn't empty we ask for password verification
+    if [ -z "$RET" ]; then
+      db_fset mysql-server/root_password seen false
+      db_fset mysql-server/root_password_again seen false
+      break
+    fi
+    ROOT_PW="$RET"
+    db_input medium mysql-server/root_password_again || true
+    db_go
+    db_get mysql-server/root_password_again
+    if [ "$RET" == "$ROOT_PW" ]; then
+      ROOT_PW=''
+      break
+    fi
+    db_fset mysql-server/password_mismatch seen false
+    db_input critical mysql-server/password_mismatch
+    db_set mysql-server/root_password "" 
+    db_set mysql-server/root_password_again ""
+    db_go
+  done
 fi
 
 # If this is an upgrade of an already existing installation ask the user if

Modified: trunk/debian/mysql-server-5.0.templates
===================================================================
--- trunk/debian/mysql-server-5.0.templates	2008-03-30 02:41:28 UTC (rev 1188)
+++ trunk/debian/mysql-server-5.0.templates	2008-03-30 18:21:06 UTC (rev 1189)
@@ -60,6 +60,10 @@
  .
  If that field is left blank, the password will not be changed.
 
+Template: mysql-server/root_password_again
+Type: password
+_Description: Repeat password for the MySQL "root" user:
+
 Template: mysql-server/error_setting_password
 Type: error
 _Description: Unable to set password for the MySQL "root" user
@@ -73,6 +77,11 @@
  Please read the /usr/share/doc/mysql-server-5.0/README.Debian file
  for more information.
 
+Template: mysql-server/password_mismatch
+Type: error
+_Description: Password input error
+ The two passwords you entered were not the same. Please try again.
+
 Template: mysql-server-5.0/need_sarge_compat
 Type: boolean
 Default: false