Fixed CORE-2561 - Incorrect database name transliteration when connec…

…ting using WNET or XNET
FirebirdSQL · Jul 19, 2009 · 68ebf17 · 68ebf17
1 parent b32e6d6
commit 68ebf17
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/src/remote/interface.cpp b/src/remote/interface.cpp
@@ -5772,6 +5772,7 @@ static bool init(ISC_STATUS* user_status,
 		// This is FB < 2.5. Lets remove that not recognized DPB and convert the UTF8
 		// strings to the OS codepage.
 		dpb.deleteWithTag(isc_dpb_utf8_filename);
+		ISC_unescape(file_name);
 		ISC_utf8ToSystem(file_name);
 
 		for (dpb.rewind(); !dpb.isEof(); dpb.moveNext())
@@ -5792,6 +5793,7 @@ static bool init(ISC_STATUS* user_status,
 				{
 					string s;
 					dpb.getString(s);
+					ISC_unescape(s);
 					ISC_utf8ToSystem(s);
 					dpb.deleteClumplet();
 					dpb.insertString(tag, s);

diff --git a/src/remote/os/win32/wnet.cpp b/src/remote/os/win32/wnet.cpp
@@ -180,7 +180,8 @@ rem_port* WNET_analyze(const Firebird::PathName& file_name,
 		REMOTE_PROTOCOL(PROTOCOL_VERSION7, ptype_rpc, ptype_batch_send, 1),
 		REMOTE_PROTOCOL(PROTOCOL_VERSION8, ptype_rpc, ptype_batch_send, 2),
 		REMOTE_PROTOCOL(PROTOCOL_VERSION10, ptype_rpc, ptype_batch_send, 3),
-		REMOTE_PROTOCOL(PROTOCOL_VERSION11, ptype_rpc, ptype_batch_send, 4)
+		REMOTE_PROTOCOL(PROTOCOL_VERSION11, ptype_rpc, ptype_batch_send, 4),
+		REMOTE_PROTOCOL(PROTOCOL_VERSION12, ptype_rpc, ptype_batch_send, 5)
 #ifdef SCROLLABLE_CURSORS
 		,
 		REMOTE_PROTOCOL(PROTOCOL_SCROLLABLE_CURSORS, ptype_rpc, ptype_batch_send, 99)

diff --git a/src/remote/xnet.cpp b/src/remote/xnet.cpp
@@ -260,7 +260,8 @@ rem_port* XNET_analyze(const Firebird::PathName& file_name,
 		REMOTE_PROTOCOL(PROTOCOL_VERSION7, ptype_rpc, ptype_batch_send, 1),
 		REMOTE_PROTOCOL(PROTOCOL_VERSION8, ptype_rpc, ptype_batch_send, 2),
 		REMOTE_PROTOCOL(PROTOCOL_VERSION10, ptype_rpc, ptype_batch_send, 3),
-		REMOTE_PROTOCOL(PROTOCOL_VERSION11, ptype_rpc, ptype_batch_send, 4)
+		REMOTE_PROTOCOL(PROTOCOL_VERSION11, ptype_rpc, ptype_batch_send, 4),
+		REMOTE_PROTOCOL(PROTOCOL_VERSION12, ptype_rpc, ptype_batch_send, 5)
 #ifdef SCROLLABLE_CURSORS
 		,
 		REMOTE_PROTOCOL(PROTOCOL_SCROLLABLE_CURSORS, ptype_rpc, ptype_batch_send, 99)