Fixed #8859: Services cannot work with user names containing space when embedded access is used

Author: AlexPeshkoff

src/jrd/svc.cpp

@@ -273,6 +273,7 @@ void Service::getOptions(ClumpletReader& spb)
 		{
 		case isc_spb_user_name:
 			spb.getString(svc_username);
+			svc_orig_username = svc_username;
 			fb_utils::dpbItemUpper(svc_username);
 			break;
 
@@ -694,8 +695,8 @@ Service::Service(const TEXT* service_name, USHORT spb_length, const UCHAR* spb_d
 	svc_resp_alloc(getPool()), svc_resp_buf(0), svc_resp_ptr(0), svc_resp_buf_len(0),
 	svc_resp_len(0), svc_flags(SVC_finished), svc_user_flag(0), svc_spb_version(0),
 	svc_shutdown_server(false), svc_shutdown_request(false),
-	svc_shutdown_in_progress(false), svc_timeout(false),
-	svc_username(getPool()), svc_sql_role(getPool()), svc_auth_block(getPool()),
+	svc_shutdown_in_progress(false), svc_timeout(false), svc_username(getPool()),
+	svc_orig_username(getPool()), svc_sql_role(getPool()), svc_auth_block(getPool()),
 	svc_expected_db(getPool()), svc_trusted_role(false), svc_utf8(false),
 	svc_switches(getPool()), svc_perm_sw(getPool()), svc_address_path(getPool()),
 	svc_command_line(getPool()), svc_parallel_workers(0),
@@ -2067,17 +2068,15 @@ void Service::start(USHORT spb_length, const UCHAR* spb_data)
 			if (svc_username.hasData())
 			{
 				string auth = "-user ";
-				auth += svc_username;
-				auth += ' ';
+				UtilSvc::addStringWithSvcTrmntr(svc_orig_username, auth);
 				svc_switches = auth + svc_switches;
 			}
 		}
 
 		if (svc_sql_role.hasData())
 		{
 			string auth = "-role ";
-			auth += svc_sql_role;
-			auth += ' ';
+			UtilSvc::addStringWithSvcTrmntr(svc_sql_role, auth);
 			svc_switches = auth + svc_switches;
 		}
 	}

src/jrd/svc.h

@@ -323,6 +323,7 @@ class Service : public Firebird::UtilSvc, public TypedHandle<type_svc>
 	char*	svc_arg_ptr;
 
 	Firebird::string	svc_username;
+	Firebird::string	svc_orig_username;
 	Firebird::string	svc_sql_role;
 	Firebird::AuthReader::AuthBlock	svc_auth_block;
 	Firebird::PathName	svc_expected_db;