Merge branch 'bug_9885' into 3.12-master

debian/scripts/koha-create

@@ -192,7 +192,7 @@ if [ "$op" = create ] || [ "$op" = request ] || [ "$op" = use ]
 then
     if [ "$mysqlpwd" = "" ]
     then
-        mysqlpwd="$(pwgen -1)"
+        mysqlpwd="$(pwgen -s 16 1)"
     fi
 else
     mysqlpwd="$(getinstancemysqlpassword $name)"
@@ -220,7 +220,7 @@ then
     koha-create-dirs "$name"
 
     # Generate Zebra database password.
-    zebrapwd="$(pwgen -s 12 1)"
+    zebrapwd="$(pwgen -s 16 1)"
     # Future enhancement: make this configurable for when your db is on
     # another server.
     mysql_hostname="localhost"
@@ -308,7 +308,7 @@ then
 
 
         # Change the default user's password.
-        staffpass="$(pwgen -1)"
+        staffpass="$(pwgen 12 1)"
         staffdigest=$(echo -n "$staffpass" |
                       perl -e '
                             use Digest::MD5 qw(md5_base64); 

debian/scripts/koha-reset-passwd

@@ -45,7 +45,7 @@ eof
 
 for userid in "$@"
 do
-    password="$(pwgen -1)"
+    password="$(pwgen 12 1)"
     digest="$(pwdigest $password)"
     echo "$userid $password"
     echo "UPDATE borrowers SET password = '$digest' WHERE userid = '$userid';" \