From e9e453cc2d327dac11ec011bc0ba95f2982b8edd Mon Sep 17 00:00:00 2001
From: Jamie Cameron <jcameron@webmin.com>
Date: Mon, 29 Jun 2015 21:21:51 -0700
Subject: [PATCH] Updating the ssl_cipher and ssl_type at the same time can
 leave ssl_type empty, so do them separately
 https://sourceforge.net/p/webadmin/bugs/4622/

---
 mysql/save_user.cgi | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/mysql/save_user.cgi b/mysql/save_user.cgi
index e1810a6d4..367ade8a5 100755
--- a/mysql/save_user.cgi
+++ b/mysql/save_user.cgi
@@ -86,9 +86,13 @@ else {
 	# Set SSL fields
 	if ($mysql_version >= 5 && defined($in{'ssl_type'})) {
 		&execute_sql_logged($master_db,
-			"update user set ssl_type = ? and ssl_cipher = ? ".
+			"update user set ssl_type = ? ".
 			"where user = ? and host = ?",
-			$in{'ssl_type'}, $in{'ssl_cipher'}, $user, $host);
+			$in{'ssl_type'}, $user, $host);
+		&execute_sql_logged($master_db,
+			"update user set ssl_cipher = ? ".
+			"where user = ? and host = ?",
+			$in{'ssl_cipher'}, $user, $host);
 		}
 	}
 &execute_sql_logged($master_db, 'flush privileges');