Fixed CORE-3000: Error on delete user "ADMIN"

FirebirdSQL · May 17, 2010 · b03e2fd · b03e2fd
1 parent de4ca91
commit b03e2fd
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/utilities/gsec/security.epp b/src/utilities/gsec/security.epp
@@ -52,9 +52,9 @@ static bool grantRevokeAdmin(ISC_STATUS* isc_status, FB_API_HANDLE DB, FB_API_HA
 
 	Firebird::string sql;
 
-	sql.printf((io_user_data->admin ? "GRANT %s TO %s" : "REVOKE %s FROM %s"),
+	sql.printf((io_user_data->admin ? "GRANT %s TO \"%s\"" : "REVOKE %s FROM \"%s\""),
 			"RDB$ADMIN", io_user_data->user_name);
-	isc_dsql_execute_immediate(isc_status, &DB, &trans, sql.length(), sql.c_str(), 1, NULL);
+	isc_dsql_execute_immediate(isc_status, &DB, &trans, sql.length(), sql.c_str(), SQL_DIALECT_V6, NULL);
 
 	if (isc_status[1] && io_user_data->admin == 0)
 	{
@@ -64,7 +64,7 @@ static bool grantRevokeAdmin(ISC_STATUS* isc_status, FB_API_HANDLE DB, FB_API_HA
 				WITH R.RDB$USER EQ io_user_data->user_name
 				 AND R.RDB$RELATION_NAME EQ 'RDB$ADMIN'
 				 AND R.RDB$PRIVILEGE EQ 'M'
-			sql.printf("REVOKE RDB$ADMIN FROM %s GRANTED BY %s",
+			sql.printf("REVOKE RDB$ADMIN FROM \"%s\" GRANTED BY \"%s\"",
 				io_user_data->user_name, R.RDB$GRANTOR);
 		END_FOR
 
@@ -77,7 +77,7 @@ static bool grantRevokeAdmin(ISC_STATUS* isc_status, FB_API_HANDLE DB, FB_API_HA
 			}
 		}
 
-		isc_dsql_execute_immediate(isc_status, &DB, &trans, sql.length(), sql.c_str(), 1, NULL);
+		isc_dsql_execute_immediate(isc_status, &DB, &trans, sql.length(), sql.c_str(), SQL_DIALECT_V6, NULL);
 	}
 
 	return isc_status[1] == 0;