Call read_dbpasswords outside of update_passwords function

eldering · eldering · commit 61c268473101 · 2025-12-06T17:34:17.000Z
This is consistent with all the other functions.
diff --git a/sql/dj_setup_database.in b/sql/dj_setup_database.in
@@ -257,7 +257,6 @@ remove_db_users()
 
 update_password()
 {
-	read_dbpasswords
 	(
     echo "ALTER USER '$domjudge_DBUSER'@'%' IDENTIFIED BY '$domjudge_PASSWD';"
 	echo "FLUSH PRIVILEGES;"
@@ -352,6 +351,7 @@ create-db-users)
 	;;
 
 update-password)
+	read_dbpasswords
 	update_password
 	;;
 

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