Call read_dbpasswords outside of update_passwords function

eldering · eldering · commit 1ddc9035b83a · 2025-11-29T14:52:29.000+01:00
This is consistent with all the other functions.
diff --git a/sql/dj_setup_database.in b/sql/dj_setup_database.in
@@ -259,7 +259,6 @@ remove_db_users()
 
 update_password()
 {
-	read_dbpasswords
 	(
     echo "ALTER USER '$domjudge_DBUSER'@'%' IDENTIFIED BY '$domjudge_PASSWD';"
 	echo "FLUSH PRIVILEGES;"
@@ -354,6 +353,7 @@ create-db-users)
 	;;
 
 update-password)
+	read_dbpasswords
 	update_password
 	;;
 

Original file line number	Diff line number	Diff line change
`@@ -259,7 +259,6 @@ remove_db_users()`
`259`	`259`
`260`	`260`	`update_password()`
`261`	`261`	`{`
`262`		`- read_dbpasswords`
`263`	`262`	`(`
`264`	`263`	`echo "ALTER USER '$domjudge_DBUSER'@'%' IDENTIFIED BY '$domjudge_PASSWD';"`
`265`	`264`	`echo "FLUSH PRIVILEGES;"`
`@@ -354,6 +353,7 @@ create-db-users)`
`354`	`353`	`;;`
`355`	`354`
`356`	`355`	`update-password)`
	`356`	`+ read_dbpasswords`
`357`	`357`	`update_password`
`358`	`358`	`;;`
`359`	`359`