Call read_dbpasswords outside of update_passwords function

eldering · eldering · commit cc8f0e53a328 · 2025-07-05T21:58:10.000+02:00
This is consistent with all the other functions.
diff --git a/sql/dj_setup_database.in b/sql/dj_setup_database.in
@@ -256,7 +256,6 @@ remove_db_users()
 
 update_password()
 {
-	read_dbpasswords
 	(
     echo "ALTER USER '$domjudge_DBUSER'@'localhost' IDENTIFIED BY '$domjudge_PASSWD';"
 	echo "FLUSH PRIVILEGES;"
@@ -351,6 +350,7 @@ create-db-users)
 	;;
 
 update-password)
+	read_dbpasswords
 	update_password
 	;;
 

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