Menu
▾
▴
[Firebird-checkins] SF.net SVN: firebird:[58885] firebird/branches/B2_5_Release
|
From: <rom...@us...> - 2013-12-04 16:24:12
|
Revision: 58885
http://sourceforge.net/p/firebird/code/58885
Author: roman-simakov
Date: 2013-12-04 16:24:08 +0000 (Wed, 04 Dec 2013)
Log Message:
-----------
Ignoring port for localhost in nbackup. Added check for localhost and error message if non localhost provided.
Modified Paths:
--------------
firebird/branches/B2_5_Release/builds/posix/Makefile.in.client.util
firebird/branches/B2_5_Release/builds/posix/Makefile.in.embed.util
firebird/branches/B2_5_Release/builds/win32/msvc10/nbackup.vcxproj
firebird/branches/B2_5_Release/builds/win32/msvc10/nbackup.vcxproj.filters
firebird/branches/B2_5_Release/builds/win32/msvc7/nbackup.vcproj
firebird/branches/B2_5_Release/builds/win32/msvc8/nbackup.vcproj
firebird/branches/B2_5_Release/builds/win32/msvc9/nbackup.vcproj
firebird/branches/B2_5_Release/src/utilities/nbackup.cpp
Modified: firebird/branches/B2_5_Release/builds/posix/Makefile.in.client.util
===================================================================
--- firebird/branches/B2_5_Release/builds/posix/Makefile.in.client.util 2013-12-04 00:47:24 UTC (rev 58884)
+++ firebird/branches/B2_5_Release/builds/posix/Makefile.in.client.util 2013-12-04 16:24:08 UTC (rev 58885)
@@ -47,7 +47,7 @@
LOCKPRINT_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(LOCKPRINT_Sources)))) \
$(FBCONFIG_Objects)
-NBACKUP_Other_Sources = jrd/db_alias.cpp common/UtilSvc.cpp $(OS_SPECIFIC_Sources)
+NBACKUP_Other_Sources = jrd/isc_file.cpp jrd/db_alias.cpp common/UtilSvc.cpp $(OS_SPECIFIC_Sources)
NBACKUP_Files= nbackup.cpp nbackup/nbkMain.cpp
NBACKUP_Sources = $(addprefix utilities/, $(NBACKUP_Files)) $(NBACKUP_Other_Sources)
NBACKUP_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(NBACKUP_Sources)))) \
Modified: firebird/branches/B2_5_Release/builds/posix/Makefile.in.embed.util
===================================================================
--- firebird/branches/B2_5_Release/builds/posix/Makefile.in.embed.util 2013-12-04 00:47:24 UTC (rev 58884)
+++ firebird/branches/B2_5_Release/builds/posix/Makefile.in.embed.util 2013-12-04 16:24:08 UTC (rev 58885)
@@ -48,7 +48,7 @@
LOCKPRINT_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(LOCKPRINT_Sources)))) \
$(FBCONFIG_Objects)
-NBACKUP_Other_Sources = jrd/db_alias.cpp common/UtilSvc.cpp $(OS_SPECIFIC_Sources)
+NBACKUP_Other_Sources = jrd/isc_file.cpp jrd/db_alias.cpp common/UtilSvc.cpp $(OS_SPECIFIC_Sources)
NBACKUP_Files= nbackup.cpp nbackup/nbkMain.cpp
NBACKUP_Sources = $(addprefix utilities/, $(NBACKUP_Files)) $(NBACKUP_Other_Sources)
Modified: firebird/branches/B2_5_Release/builds/win32/msvc10/nbackup.vcxproj
===================================================================
--- firebird/branches/B2_5_Release/builds/win32/msvc10/nbackup.vcxproj 2013-12-04 00:47:24 UTC (rev 58884)
+++ firebird/branches/B2_5_Release/builds/win32/msvc10/nbackup.vcxproj 2013-12-04 16:24:08 UTC (rev 58885)
@@ -167,6 +167,8 @@
<ClCompile Include="..\..\..\src\utilities\nbackup.cpp" />
<ClCompile Include="..\..\..\src\utilities\nbackup\nbkMain.cpp" />
<ClCompile Include="..\..\..\src\jrd\os\win32\guid.cpp" />
+ <ClCompile Include="..\..\..\src\jrd\isc_file.cpp" />
+ <ClCompile Include="..\..\..\src\jrd\isc.cpp" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\..\..\src\jrd\version.rc">
@@ -189,4 +191,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
Modified: firebird/branches/B2_5_Release/builds/win32/msvc10/nbackup.vcxproj.filters
===================================================================
--- firebird/branches/B2_5_Release/builds/win32/msvc10/nbackup.vcxproj.filters 2013-12-04 00:47:24 UTC (rev 58884)
+++ firebird/branches/B2_5_Release/builds/win32/msvc10/nbackup.vcxproj.filters 2013-12-04 16:24:08 UTC (rev 58885)
@@ -26,10 +26,16 @@
<ClCompile Include="..\..\..\src\jrd\os\win32\guid.cpp">
<Filter>JRD files</Filter>
</ClCompile>
+ <ClCompile Include="..\..\..\src\jrd\isc_file.cpp">
+ <Filter>JRD files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\jrd\isc.cpp">
+ <Filter>JRD files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\..\..\src\jrd\version.rc">
<Filter>Resource files</Filter>
</ResourceCompile>
</ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
Modified: firebird/branches/B2_5_Release/builds/win32/msvc7/nbackup.vcproj
===================================================================
--- firebird/branches/B2_5_Release/builds/win32/msvc7/nbackup.vcproj 2013-12-04 00:47:24 UTC (rev 58884)
+++ firebird/branches/B2_5_Release/builds/win32/msvc7/nbackup.vcproj 2013-12-04 16:24:08 UTC (rev 58885)
@@ -73,8 +73,12 @@
<Filter Name="JRD files">
<File RelativePath="..\..\..\src\jrd\os\win32\guid.cpp">
</File>
+ <File RelativePath="..\..\..\src\jrd\isc_file.cpp">
+ </File>
+ <File RelativePath="..\..\..\src\jrd\isc.cpp">
+ </File>
</Filter>
</Files>
<Globals>
</Globals>
-</VisualStudioProject>
\ No newline at end of file
+</VisualStudioProject>
Modified: firebird/branches/B2_5_Release/builds/win32/msvc8/nbackup.vcproj
===================================================================
--- firebird/branches/B2_5_Release/builds/win32/msvc8/nbackup.vcproj 2013-12-04 00:47:24 UTC (rev 58884)
+++ firebird/branches/B2_5_Release/builds/win32/msvc8/nbackup.vcproj 2013-12-04 16:24:08 UTC (rev 58885)
@@ -380,6 +380,14 @@
RelativePath="..\..\..\src\jrd\os\win32\guid.cpp"
>
</File>
+ <File
+ RelativePath="..\..\..\src\jrd\isc_file.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\src\jrd\isc.cpp"
+ >
+ </File>
</Filter>
</Files>
<Globals>
Modified: firebird/branches/B2_5_Release/builds/win32/msvc9/nbackup.vcproj
===================================================================
--- firebird/branches/B2_5_Release/builds/win32/msvc9/nbackup.vcproj 2013-12-04 00:47:24 UTC (rev 58884)
+++ firebird/branches/B2_5_Release/builds/win32/msvc9/nbackup.vcproj 2013-12-04 16:24:08 UTC (rev 58885)
@@ -377,6 +377,14 @@
RelativePath="..\..\..\src\jrd\os\win32\guid.cpp"
>
</File>
+ <File
+ RelativePath="..\..\..\src\jrd\isc_file.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\src\jrd\isc.cpp"
+ >
+ </File>
</Filter>
</Files>
<Globals>
Modified: firebird/branches/B2_5_Release/src/utilities/nbackup.cpp
===================================================================
--- firebird/branches/B2_5_Release/src/utilities/nbackup.cpp 2013-12-04 00:47:24 UTC (rev 58884)
+++ firebird/branches/B2_5_Release/src/utilities/nbackup.cpp 2013-12-04 16:24:08 UTC (rev 58885)
@@ -49,6 +49,7 @@
#include "../utilities/nbackup/nbk_proto.h"
#include "../jrd/license.h"
#include "../common/classes/MsgPrint.h"
+#include "../jrd/isc_f_proto.h"
#ifdef HAVE_UNISTD_H
#include <unistd.h>
@@ -254,7 +255,7 @@
#endif
-const char local_prefix[] = "localhost:";
+const char localhost[] = "localhost";
const char backup_signature[4] = {'N','B','A','K'};
@@ -286,9 +287,13 @@
// Recognition of local prefix allows to work with
// database using TCP/IP loopback while reading file locally.
// This makes NBACKUP compatible with Windows CS with XNET disabled
- PathName db(_database);
- if (strncmp(db.c_str(), local_prefix, sizeof(local_prefix) - 1) == 0)
- db = db.substr(sizeof(local_prefix) - 1);
+ // RS: Maybe check if host is loopback via OS functions is more correct
+ PathName db(_database), host;
+ if (ISC_extract_host(db, host, false) == ISC_PROTOCOL_TCPIP)
+ {
+ if (strncmp(host.c_str(), localhost, sizeof(localhost) - 1) != 0)
+ pr_error(status, "nbackup needs local access to database file");
+ }
if (!ResolveDatabaseAlias(db, dbname))
dbname = db;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
