Menu
▾
▴
firebird-checkins
|
From: <fir...@us...> - 2013-09-20 00:29:23
|
Revision: 58644
http://sourceforge.net/p/firebird/code/58644
Author: firebirds
Date: 2013-09-20 00:29:19 +0000 (Fri, 20 Sep 2013)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2013-09-19 11:08:11 UTC (rev 58643)
+++ firebird/trunk/ChangeLog 2013-09-20 00:29:19 UTC (rev 58644)
@@ -1,3 +1,49 @@
+ 2013-09-18 18:38 hvlad
+ M src/jrd/Database.cpp
+Correction for fix for bug CORE-4134 : Race condition when auto-sweep is started
+The patch wrongly disabled manual sweep to run when database is shutdown.
+Auto sweep is still disabled to run on such database.
+
+ 2013-09-18 16:33 asfernandes
+ M src/dsql/parse.y
+Fixed CORE-4227 - Wrong evaluation of BETWEEN and boolean expressions due to parser conflict.
+
+ 2013-09-18 16:03 alexpeshkoff
+ M src/common/classes/array.h
+ M src/common/classes/objects_array.h
+ M src/common/config/config_file.cpp
+ M src/common/config/config_file.h
+ M src/utilities/ntrace/TraceConfiguration.cpp
+Fixed CORE-4163: Configuration fbtrace.conf contains syntax errors (make trace use native order of config file keys)
+
+ 2013-09-18 16:01 alexpeshkoff
+ M src/utilities/ntrace/os/posix/platform.cpp
+Comment
+
+ 2013-09-18 13:48 hvlad
+ M src/jrd/trace/TraceObjects.cpp
+ M src/utilities/ntrace/TracePluginImpl.cpp
+Fixed bug CORE-4225 : Server crashes when attempting to trace activity on database having a db-level trigger
+
+ 2013-09-18 09:37 dimitr
+ M src/include/gen/ids.h
+Implemented CORE-4218 (database owner in MON$DATABASE) and CORE-4222 (auth method in MON$ATTACHMENTS).
+
+ 2013-09-18 09:37 dimitr
+ M src/jrd/Database.h
+ M src/jrd/DatabaseSnapshot.cpp
+ M src/jrd/fields.h
+ M src/jrd/jrd.cpp
+ M src/jrd/names.h
+ M src/jrd/relations.h
+ M src/jrd/scl.epp
+ M src/jrd/scl.h
+Implemented CORE-4218 (database owner in MON$DATABASE) and CORE-4222 (auth method in MON$ATTACHMENTS).
+
+ 2013-09-18 09:35 dimitr
+ M src/common/classes/MetaName.h
+Added comparison operations against string types.
+
2013-09-16 13:55 alexpeshkoff
M src/common/config/config_file.cpp
Fixed CORE-4219: Regular expressions with double-slash fail in trace
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2013-09-19 11:08:11 UTC (rev 58643)
+++ firebird/trunk/src/jrd/build_no.h 2013-09-20 00:29:19 UTC (rev 58644)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:30653
+ FORMAL BUILD NUMBER:30661
*/
-#define PRODUCT_VER_STRING "3.0.0.30653"
-#define FILE_VER_STRING "WI-T3.0.0.30653"
-#define LICENSE_VER_STRING "WI-T3.0.0.30653"
-#define FILE_VER_NUMBER 3, 0, 0, 30653
+#define PRODUCT_VER_STRING "3.0.0.30661"
+#define FILE_VER_STRING "WI-T3.0.0.30661"
+#define LICENSE_VER_STRING "WI-T3.0.0.30661"
+#define FILE_VER_NUMBER 3, 0, 0, 30661
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "30653"
+#define FB_BUILD_NO "30661"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 1"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2013-09-19 11:08:11 UTC (rev 58643)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2013-09-20 00:29:19 UTC (rev 58644)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=30653
+BuildNum=30661
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2013-09-22 00:30:58
|
Revision: 58651
http://sourceforge.net/p/firebird/code/58651
Author: firebirds
Date: 2013-09-22 00:30:52 +0000 (Sun, 22 Sep 2013)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2013-09-21 07:24:52 UTC (rev 58650)
+++ firebird/trunk/ChangeLog 2013-09-22 00:30:52 UTC (rev 58651)
@@ -1,3 +1,18 @@
+ 2013-09-20 08:28 dimitr
+ M src/dsql/ExprNodes.cpp
+ M src/dsql/StmtNodes.cpp
+ M src/jrd/exe.cpp
+Somewhat hackery fix for CORE-4201: Computed field returns null value inside BI trigger.
+A better solution requires major changes and will be investigated in trunk later.
+
+ 2013-09-20 07:06 dimitr
+ M src/jrd/recsrc/AggregatedStream.cpp
+ M src/jrd/recsrc/BufferedStream.cpp
+ M src/jrd/recsrc/Cursor.cpp
+ M src/jrd/recsrc/RecordSource.h
+ M src/jrd/recsrc/WindowedStream.cpp
+Fixed CORE-4229: Bi-directional cursor is not positioned by the first call of FETCH LAST.
+
2013-09-18 18:38 hvlad
M src/jrd/Database.cpp
Correction for fix for bug CORE-4134 : Race condition when auto-sweep is started
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2013-09-21 07:24:52 UTC (rev 58650)
+++ firebird/trunk/src/jrd/build_no.h 2013-09-22 00:30:52 UTC (rev 58651)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:30661
+ FORMAL BUILD NUMBER:30663
*/
-#define PRODUCT_VER_STRING "3.0.0.30661"
-#define FILE_VER_STRING "WI-T3.0.0.30661"
-#define LICENSE_VER_STRING "WI-T3.0.0.30661"
-#define FILE_VER_NUMBER 3, 0, 0, 30661
+#define PRODUCT_VER_STRING "3.0.0.30663"
+#define FILE_VER_STRING "WI-T3.0.0.30663"
+#define LICENSE_VER_STRING "WI-T3.0.0.30663"
+#define FILE_VER_NUMBER 3, 0, 0, 30663
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "30661"
+#define FB_BUILD_NO "30663"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 1"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2013-09-21 07:24:52 UTC (rev 58650)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2013-09-22 00:30:52 UTC (rev 58651)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=30661
+BuildNum=30663
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2013-09-25 00:27:39
|
Revision: 58666
http://sourceforge.net/p/firebird/code/58666
Author: firebirds
Date: 2013-09-25 00:27:35 +0000 (Wed, 25 Sep 2013)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2013-09-24 12:24:09 UTC (rev 58665)
+++ firebird/trunk/ChangeLog 2013-09-25 00:27:35 UTC (rev 58666)
@@ -1,3 +1,53 @@
+ 2013-09-24 08:46 alexpeshkoff
+ M src/common/classes/Hash.h
+ M src/common/classes/array.h
+ M src/common/classes/fb_pair.h
+ M src/common/classes/objects_array.h
+ M src/common/classes/vector.h
+ M src/common/config/config_file.h
+ M src/common/db_alias.cpp
+ M src/jrd/DebugInterface.h
+ M src/jrd/GarbageCollector.h
+ M src/jrd/Relation.h
+ M src/jrd/RuntimeStatistics.h
+ M src/jrd/dfw.epp
+ M src/jrd/extds/ExtDS.h
+ M src/jrd/os/win32/win9x_nt.h
+ M src/jrd/pag.h
+ M src/jrd/rpb_chain.h
+ M src/jrd/sort.cpp
+ M src/jrd/tpc_proto.h
+ M src/jrd/trace/TraceManager.h
+ M src/remote/server/server.cpp
+ M src/yvalve/MasterImplementation.cpp
+Cleanup - avoid unneeded generate's argument in SortedArray and Hash
+
+ 2013-09-23 18:50 asfernandes
+ M src/dsql/StmtNodes.cpp
+Fixed CORE-4234 - Error with IF (subfunc()) when subfunc returns a boolean.
+
+ 2013-09-23 12:27 dimitr
+ M src/common/classes/MetaName.h
+Misc.
+
+ 2013-09-22 16:10 dimitr
+ M src/jrd/Attachment.cpp
+ M src/jrd/Attachment.h
+ M src/jrd/DatabaseSnapshot.cpp
+ M src/jrd/DatabaseSnapshot.h
+ M src/jrd/jrd.cpp
+Attempted to fix CORE-4235: Deadlock is possible while accessing the monitoring tables under concurrent load.
+Refactored the list of reference counted attachments to be useful in other cases.
+Some minor adjustments in the monitoring code.
+
+ 2013-09-22 15:36 dimitr
+ M src/common/classes/SyncObject.h
+Added conditional locking option to Firebird::Sync.
+
+ 2013-09-22 15:35 dimitr
+ M src/jrd/cch.cpp
+Unconditionally flush the page cache to disk if FLUSH_ALL / FLUSH_FINI modes are used and FW=OFF. This puts a little bit more consistency and favors explicit flushes over implicit ones (e.g. when database is detached and its file is closed).
+
2013-09-20 08:28 dimitr
M src/dsql/ExprNodes.cpp
M src/dsql/StmtNodes.cpp
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2013-09-24 12:24:09 UTC (rev 58665)
+++ firebird/trunk/src/jrd/build_no.h 2013-09-25 00:27:35 UTC (rev 58666)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:30663
+ FORMAL BUILD NUMBER:30669
*/
-#define PRODUCT_VER_STRING "3.0.0.30663"
-#define FILE_VER_STRING "WI-T3.0.0.30663"
-#define LICENSE_VER_STRING "WI-T3.0.0.30663"
-#define FILE_VER_NUMBER 3, 0, 0, 30663
+#define PRODUCT_VER_STRING "3.0.0.30669"
+#define FILE_VER_STRING "WI-T3.0.0.30669"
+#define LICENSE_VER_STRING "WI-T3.0.0.30669"
+#define FILE_VER_NUMBER 3, 0, 0, 30669
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "30663"
+#define FB_BUILD_NO "30669"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 1"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2013-09-24 12:24:09 UTC (rev 58665)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2013-09-25 00:27:35 UTC (rev 58666)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=30663
+BuildNum=30669
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2013-09-26 00:27:16
|
Revision: 58671
http://sourceforge.net/p/firebird/code/58671
Author: firebirds
Date: 2013-09-26 00:27:12 +0000 (Thu, 26 Sep 2013)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2013-09-25 15:49:43 UTC (rev 58670)
+++ firebird/trunk/ChangeLog 2013-09-26 00:27:12 UTC (rev 58671)
@@ -1,3 +1,21 @@
+ 2013-09-25 15:49 asfernandes
+ M src/dsql/DdlNodes.epp
+ M src/dsql/ExprNodes.cpp
+ M src/dsql/dsql.h
+ M src/jrd/ExtEngineManager.cpp
+ M src/jrd/met.epp
+ M src/jrd/met_proto.h
+ M src/jrd/par.cpp
+Fixed CORE-4145 - Memory leak when preparing Execute Block which uses domains.
+
+ 2013-09-25 15:01 mapopa
+ M builds/posix/make.android.arme
+make the paths a little more portable between versions
+
+ 2013-09-25 12:57 mapopa
+ M builds/posix/make.android.arme
+make it compilable with android ndk-r9
+
2013-09-24 08:46 alexpeshkoff
M src/common/classes/Hash.h
M src/common/classes/array.h
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2013-09-25 15:49:43 UTC (rev 58670)
+++ firebird/trunk/src/jrd/build_no.h 2013-09-26 00:27:12 UTC (rev 58671)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:30669
+ FORMAL BUILD NUMBER:30672
*/
-#define PRODUCT_VER_STRING "3.0.0.30669"
-#define FILE_VER_STRING "WI-T3.0.0.30669"
-#define LICENSE_VER_STRING "WI-T3.0.0.30669"
-#define FILE_VER_NUMBER 3, 0, 0, 30669
+#define PRODUCT_VER_STRING "3.0.0.30672"
+#define FILE_VER_STRING "WI-T3.0.0.30672"
+#define LICENSE_VER_STRING "WI-T3.0.0.30672"
+#define FILE_VER_NUMBER 3, 0, 0, 30672
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "30669"
+#define FB_BUILD_NO "30672"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 1"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2013-09-25 15:49:43 UTC (rev 58670)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2013-09-26 00:27:12 UTC (rev 58671)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=30669
+BuildNum=30672
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2013-09-27 00:26:37
|
Revision: 58674
http://sourceforge.net/p/firebird/code/58674
Author: firebirds
Date: 2013-09-27 00:26:30 +0000 (Fri, 27 Sep 2013)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2013-09-26 15:37:21 UTC (rev 58673)
+++ firebird/trunk/ChangeLog 2013-09-27 00:26:30 UTC (rev 58674)
@@ -1,3 +1,7 @@
+ 2013-09-26 07:42 alexpeshkoff
+ M src/include/cross/android.arme
+This should help cross-compile for Android
+
2013-09-25 15:49 asfernandes
M src/dsql/DdlNodes.epp
M src/dsql/ExprNodes.cpp
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2013-09-26 15:37:21 UTC (rev 58673)
+++ firebird/trunk/src/jrd/build_no.h 2013-09-27 00:26:30 UTC (rev 58674)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:30672
+ FORMAL BUILD NUMBER:30673
*/
-#define PRODUCT_VER_STRING "3.0.0.30672"
-#define FILE_VER_STRING "WI-T3.0.0.30672"
-#define LICENSE_VER_STRING "WI-T3.0.0.30672"
-#define FILE_VER_NUMBER 3, 0, 0, 30672
+#define PRODUCT_VER_STRING "3.0.0.30673"
+#define FILE_VER_STRING "WI-T3.0.0.30673"
+#define LICENSE_VER_STRING "WI-T3.0.0.30673"
+#define FILE_VER_NUMBER 3, 0, 0, 30673
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "30672"
+#define FB_BUILD_NO "30673"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 1"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2013-09-26 15:37:21 UTC (rev 58673)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2013-09-27 00:26:30 UTC (rev 58674)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=30672
+BuildNum=30673
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2013-10-01 00:30:32
|
Revision: 58679
http://sourceforge.net/p/firebird/code/58679
Author: firebirds
Date: 2013-10-01 00:30:29 +0000 (Tue, 01 Oct 2013)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2013-09-30 03:09:21 UTC (rev 58678)
+++ firebird/trunk/ChangeLog 2013-10-01 00:30:29 UTC (rev 58679)
@@ -1,3 +1,9 @@
+ 2013-09-29 09:09 hvlad
+ M src/jrd/nbak.cpp
+ M src/jrd/nbak.h
+ M src/jrd/pag.cpp
+Additional fix for bug CORE-2648 : Nbackup's delta file ignored Forced Writes database setting
+
2013-09-26 07:42 alexpeshkoff
M src/include/cross/android.arme
This should help cross-compile for Android
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2013-09-30 03:09:21 UTC (rev 58678)
+++ firebird/trunk/src/jrd/build_no.h 2013-10-01 00:30:29 UTC (rev 58679)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:30673
+ FORMAL BUILD NUMBER:30674
*/
-#define PRODUCT_VER_STRING "3.0.0.30673"
-#define FILE_VER_STRING "WI-T3.0.0.30673"
-#define LICENSE_VER_STRING "WI-T3.0.0.30673"
-#define FILE_VER_NUMBER 3, 0, 0, 30673
+#define PRODUCT_VER_STRING "3.0.0.30674"
+#define FILE_VER_STRING "WI-T3.0.0.30674"
+#define LICENSE_VER_STRING "WI-T3.0.0.30674"
+#define FILE_VER_NUMBER 3, 0, 0, 30674
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "30673"
+#define FB_BUILD_NO "30674"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 1"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2013-09-30 03:09:21 UTC (rev 58678)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2013-10-01 00:30:29 UTC (rev 58679)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=30673
+BuildNum=30674
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2013-10-02 01:11:58
|
Revision: 58682
http://sourceforge.net/p/firebird/code/58682
Author: firebirds
Date: 2013-10-02 01:11:54 +0000 (Wed, 02 Oct 2013)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2013-10-01 09:30:52 UTC (rev 58681)
+++ firebird/trunk/ChangeLog 2013-10-02 01:11:54 UTC (rev 58682)
@@ -1,3 +1,12 @@
+ 2013-10-01 09:30 alexpeshkoff
+ M src/common/classes/alloc.h
+Misc
+
+ 2013-10-01 08:08 alexpeshkoff
+ M src/common/classes/alloc.cpp
+ M src/common/classes/alloc.h
+Fixed build with valgrind
+
2013-09-29 09:09 hvlad
M src/jrd/nbak.cpp
M src/jrd/nbak.h
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2013-10-01 09:30:52 UTC (rev 58681)
+++ firebird/trunk/src/jrd/build_no.h 2013-10-02 01:11:54 UTC (rev 58682)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:30674
+ FORMAL BUILD NUMBER:30676
*/
-#define PRODUCT_VER_STRING "3.0.0.30674"
-#define FILE_VER_STRING "WI-T3.0.0.30674"
-#define LICENSE_VER_STRING "WI-T3.0.0.30674"
-#define FILE_VER_NUMBER 3, 0, 0, 30674
+#define PRODUCT_VER_STRING "3.0.0.30676"
+#define FILE_VER_STRING "WI-T3.0.0.30676"
+#define LICENSE_VER_STRING "WI-T3.0.0.30676"
+#define FILE_VER_NUMBER 3, 0, 0, 30676
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "30674"
+#define FB_BUILD_NO "30676"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 1"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2013-10-01 09:30:52 UTC (rev 58681)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2013-10-02 01:11:54 UTC (rev 58682)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=30674
+BuildNum=30676
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2013-10-04 00:28:55
|
Revision: 58687
http://sourceforge.net/p/firebird/code/58687
Author: firebirds
Date: 2013-10-04 00:28:51 +0000 (Fri, 04 Oct 2013)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2013-10-03 15:38:58 UTC (rev 58686)
+++ firebird/trunk/ChangeLog 2013-10-04 00:28:51 UTC (rev 58687)
@@ -1,3 +1,20 @@
+ 2013-10-03 15:38 asfernandes
+ M src/dsql/DdlNodes.epp
+ M src/dsql/parse.y
+Fixed CORE-4237 - FB3 vs FB2.5. Different metadata for UDF return argument.
+
+ 2013-10-02 12:41 hvlad
+ M src/common/classes/SyncObject.cpp
+Fixed bug in downgrade()
+
+ 2013-10-02 12:39 hvlad
+ M src/jrd/DatabaseSnapshot.cpp
+Lets not return isc_att_shutdown error when some of the attachments in monitoring snapshot are gone while dump was creating
+
+ 2013-10-02 08:19 hvlad
+ M src/jrd/validation.cpp
+Fixed typo's in few validation messages
+
2013-10-01 09:30 alexpeshkoff
M src/common/classes/alloc.h
Misc
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2013-10-03 15:38:58 UTC (rev 58686)
+++ firebird/trunk/src/jrd/build_no.h 2013-10-04 00:28:51 UTC (rev 58687)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:30676
+ FORMAL BUILD NUMBER:30680
*/
-#define PRODUCT_VER_STRING "3.0.0.30676"
-#define FILE_VER_STRING "WI-T3.0.0.30676"
-#define LICENSE_VER_STRING "WI-T3.0.0.30676"
-#define FILE_VER_NUMBER 3, 0, 0, 30676
+#define PRODUCT_VER_STRING "3.0.0.30680"
+#define FILE_VER_STRING "WI-T3.0.0.30680"
+#define LICENSE_VER_STRING "WI-T3.0.0.30680"
+#define FILE_VER_NUMBER 3, 0, 0, 30680
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "30676"
+#define FB_BUILD_NO "30680"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 1"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2013-10-03 15:38:58 UTC (rev 58686)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2013-10-04 00:28:51 UTC (rev 58687)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=30676
+BuildNum=30680
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2013-10-05 00:48:15
|
Revision: 58689
http://sourceforge.net/p/firebird/code/58689
Author: firebirds
Date: 2013-10-05 00:48:12 +0000 (Sat, 05 Oct 2013)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2013-10-04 15:58:03 UTC (rev 58688)
+++ firebird/trunk/ChangeLog 2013-10-05 00:48:12 UTC (rev 58689)
@@ -1,3 +1,9 @@
+ 2013-10-04 15:58 asfernandes
+ M src/dsql/DdlNodes.epp
+ M src/dsql/DdlNodes.h
+Fixed CORE-4237 - FB3 vs FB2.5. Different metadata for UDF return argument.
+The is a case showing a difference between 2.5 and 3.0 in the first comment. The second comment does not show difference between versions.
+
2013-10-03 15:38 asfernandes
M src/dsql/DdlNodes.epp
M src/dsql/parse.y
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2013-10-04 15:58:03 UTC (rev 58688)
+++ firebird/trunk/src/jrd/build_no.h 2013-10-05 00:48:12 UTC (rev 58689)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:30680
+ FORMAL BUILD NUMBER:30681
*/
-#define PRODUCT_VER_STRING "3.0.0.30680"
-#define FILE_VER_STRING "WI-T3.0.0.30680"
-#define LICENSE_VER_STRING "WI-T3.0.0.30680"
-#define FILE_VER_NUMBER 3, 0, 0, 30680
+#define PRODUCT_VER_STRING "3.0.0.30681"
+#define FILE_VER_STRING "WI-T3.0.0.30681"
+#define LICENSE_VER_STRING "WI-T3.0.0.30681"
+#define FILE_VER_NUMBER 3, 0, 0, 30681
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "30680"
+#define FB_BUILD_NO "30681"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 1"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2013-10-04 15:58:03 UTC (rev 58688)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2013-10-05 00:48:12 UTC (rev 58689)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=30680
+BuildNum=30681
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2013-10-14 00:28:50
|
Revision: 58693
http://sourceforge.net/p/firebird/code/58693
Author: firebirds
Date: 2013-10-14 00:28:48 +0000 (Mon, 14 Oct 2013)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2013-10-13 23:44:57 UTC (rev 58692)
+++ firebird/trunk/ChangeLog 2013-10-14 00:28:48 UTC (rev 58693)
@@ -1,3 +1,15 @@
+ 2013-10-13 23:44 asfernandes
+ M src/isql/extract.epp
+ M src/isql/isql.epp
+ M src/jrd/DatabaseSnapshot.cpp
+ M src/jrd/btr.cpp
+ M src/jrd/exe.cpp
+ M src/jrd/nbak.cpp
+ M src/jrd/pag.cpp
+ M src/jrd/tra.cpp
+ M src/jrd/vio.cpp
+Misc.
+
2013-10-04 15:58 asfernandes
M src/dsql/DdlNodes.epp
M src/dsql/DdlNodes.h
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2013-10-13 23:44:57 UTC (rev 58692)
+++ firebird/trunk/src/jrd/build_no.h 2013-10-14 00:28:48 UTC (rev 58693)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:30681
+ FORMAL BUILD NUMBER:30682
*/
-#define PRODUCT_VER_STRING "3.0.0.30681"
-#define FILE_VER_STRING "WI-T3.0.0.30681"
-#define LICENSE_VER_STRING "WI-T3.0.0.30681"
-#define FILE_VER_NUMBER 3, 0, 0, 30681
+#define PRODUCT_VER_STRING "3.0.0.30682"
+#define FILE_VER_STRING "WI-T3.0.0.30682"
+#define LICENSE_VER_STRING "WI-T3.0.0.30682"
+#define FILE_VER_NUMBER 3, 0, 0, 30682
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "30681"
+#define FB_BUILD_NO "30682"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 1"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2013-10-13 23:44:57 UTC (rev 58692)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2013-10-14 00:28:48 UTC (rev 58693)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=30681
+BuildNum=30682
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2013-10-16 00:27:49
|
Revision: 58697
http://sourceforge.net/p/firebird/code/58697
Author: firebirds
Date: 2013-10-16 00:27:45 +0000 (Wed, 16 Oct 2013)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2013-10-15 15:26:34 UTC (rev 58696)
+++ firebird/trunk/ChangeLog 2013-10-16 00:27:45 UTC (rev 58697)
@@ -1,3 +1,10 @@
+ 2013-10-15 15:26 asfernandes
+ M src/common/CharSet.h
+ M src/common/TextType.cpp
+ M src/jrd/evl_string.h
+ M src/jrd/opt.cpp
+Frontport fix for CORE-4244 - Problem with creation procedure which contain adding text in DOS864 charset.
+
2013-10-13 23:44 asfernandes
M src/isql/extract.epp
M src/isql/isql.epp
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2013-10-15 15:26:34 UTC (rev 58696)
+++ firebird/trunk/src/jrd/build_no.h 2013-10-16 00:27:45 UTC (rev 58697)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:30682
+ FORMAL BUILD NUMBER:30683
*/
-#define PRODUCT_VER_STRING "3.0.0.30682"
-#define FILE_VER_STRING "WI-T3.0.0.30682"
-#define LICENSE_VER_STRING "WI-T3.0.0.30682"
-#define FILE_VER_NUMBER 3, 0, 0, 30682
+#define PRODUCT_VER_STRING "3.0.0.30683"
+#define FILE_VER_STRING "WI-T3.0.0.30683"
+#define LICENSE_VER_STRING "WI-T3.0.0.30683"
+#define FILE_VER_NUMBER 3, 0, 0, 30683
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "30682"
+#define FB_BUILD_NO "30683"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 1"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2013-10-15 15:26:34 UTC (rev 58696)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2013-10-16 00:27:45 UTC (rev 58697)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=30682
+BuildNum=30683
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ale...@us...> - 2013-10-16 12:53:10
|
Revision: 58698
http://sourceforge.net/p/firebird/code/58698
Author: alexpeshkoff
Date: 2013-10-16 12:53:04 +0000 (Wed, 16 Oct 2013)
Log Message:
-----------
Fix found by Jim Starkey man-in-themiddle attack on ATTACH packet.
That packet may contain database name, command line for service and/or some other important and critical information.
To avoid such attack wire encryption is started before attaching database or service manager, right after connect.
Also should fix a number of issues found in Alpha1 regarding services attach.
Modified Paths:
--------------
firebird/trunk/doc/README.services_extension
firebird/trunk/lang_helpers/gds_codes.ftn
firebird/trunk/lang_helpers/gds_codes.pas
firebird/trunk/src/auth/SecureRemotePassword/client/SrpClient.cpp
firebird/trunk/src/auth/SecureRemotePassword/manage/SrpManagement.cpp
firebird/trunk/src/auth/SecureRemotePassword/server/SrpServer.cpp
firebird/trunk/src/auth/SecureRemotePassword/srp.cpp
firebird/trunk/src/auth/SecureRemotePassword/srp.h
firebird/trunk/src/auth/SecurityDatabase/LegacyManagement.epp
firebird/trunk/src/auth/SecurityDatabase/LegacyServer.cpp
firebird/trunk/src/burp/burp.cpp
firebird/trunk/src/common/IntlParametersBlock.cpp
firebird/trunk/src/common/classes/ClumpletReader.cpp
firebird/trunk/src/common/classes/ClumpletReader.h
firebird/trunk/src/common/classes/array.h
firebird/trunk/src/common/classes/fb_string.h
firebird/trunk/src/common/config/config.cpp
firebird/trunk/src/common/config/config.h
firebird/trunk/src/include/consts_pub.h
firebird/trunk/src/include/gen/codetext.h
firebird/trunk/src/include/gen/iberror.h
firebird/trunk/src/include/gen/msgs.h
firebird/trunk/src/include/gen/sql_code.h
firebird/trunk/src/include/gen/sql_state.h
firebird/trunk/src/jrd/jrd.cpp
firebird/trunk/src/jrd/svc.cpp
firebird/trunk/src/msgs/facilities2.sql
firebird/trunk/src/msgs/messages2.sql
firebird/trunk/src/msgs/system_errors2.sql
firebird/trunk/src/remote/client/interface.cpp
firebird/trunk/src/remote/inet.cpp
firebird/trunk/src/remote/inet_proto.h
firebird/trunk/src/remote/os/win32/wnet.cpp
firebird/trunk/src/remote/os/win32/wnet_proto.h
firebird/trunk/src/remote/os/win32/xnet.cpp
firebird/trunk/src/remote/os/win32/xnet_proto.h
firebird/trunk/src/remote/protocol.cpp
firebird/trunk/src/remote/protocol.h
firebird/trunk/src/remote/remot_proto.h
firebird/trunk/src/remote/remote.cpp
firebird/trunk/src/remote/remote.h
firebird/trunk/src/remote/server/server.cpp
firebird/trunk/src/utilities/fbsvcmgr/fbsvcmgr.cpp
firebird/trunk/src/utilities/gsec/gsec.cpp
firebird/trunk/src/yvalve/YObjects.h
firebird/trunk/src/yvalve/utl.cpp
firebird/trunk/src/yvalve/why.cpp
Modified: firebird/trunk/doc/README.services_extension
===================================================================
--- firebird/trunk/doc/README.services_extension 2013-10-16 00:27:45 UTC (rev 58697)
+++ firebird/trunk/doc/README.services_extension 2013-10-16 12:53:04 UTC (rev 58698)
@@ -191,3 +191,35 @@
A sample of how services API should be used for remote backup and restore can be
found in source code of fbsvcmgr.
+
+
+5) Services API extension - using services with non-default security database.
+(Alex Peshkov, pes...@ma..., 2013)
+
+If one wants to use services API to access database which is configured to use
+non-default security database new SPB item isc_spb_expected_db should be used
+when attaching to services manager. Value of this item is a database which is
+expected to be accessed.
+
+Formally this does not raise backward incompatibility - as long as one does not
+use new FB3 feature (multiple security databases) he has no problems with old
+programs using services API. In a case when one has really big need to use old
+program for a database with non-default configuration there is a workaround:
+setting environment variable FB_EXPECTED_DB which will be added to SPB
+automatically.
+
+Example. Imagine we have the following lines in databases.conf:
+employee = $(dir_sampledb)/employee.fdb
+{
+ SecurityDatabase = employee
+}
+i.e. employee database is configured as security database for itself.
+
+To access it using fbsvcmgr one should use the following command line:
+fbsvcmgr host:service_mgr user sysdba password xxx expected_db employee action_db_stats dbname employee sts_data_pages
+
+or in advance set FB_EXPECTED_DB:
+export FB_EXPECTED_DB=employee
+fbsvcmgr host:service_mgr user sysdba password xxx action_db_stats dbname employee sts_data_pages
+
+Certainly any other database action can be used here.
Modified: firebird/trunk/lang_helpers/gds_codes.ftn
===================================================================
--- firebird/trunk/lang_helpers/gds_codes.ftn 2013-10-16 00:27:45 UTC (rev 58697)
+++ firebird/trunk/lang_helpers/gds_codes.ftn 2013-10-16 12:53:04 UTC (rev 58698)
@@ -1530,6 +1530,28 @@
PARAMETER (GDS__protect_ownership = 335545058)
INTEGER*4 GDS__badvarnum
PARAMETER (GDS__badvarnum = 335545059)
+ INTEGER*4 GDS__sec_context
+ PARAMETER (GDS__sec_context = 335545060)
+ INTEGER*4 GDS__multi_segment
+ PARAMETER (GDS__multi_segment = 335545061)
+ INTEGER*4 GDS__login_changed
+ PARAMETER (GDS__login_changed = 335545062)
+ INTEGER*4 GDS__auth_handshake_limit
+ PARAMETER (GDS__auth_handshake_limit = 335545063)
+ INTEGER*4 GDS__wirecrypt_incompatible
+ PARAMETER (GDS__wirecrypt_incompatible = 335545064)
+ INTEGER*4 GDS__miss_wirecrypt
+ PARAMETER (GDS__miss_wirecrypt = 335545065)
+ INTEGER*4 GDS__wirecrypt_key
+ PARAMETER (GDS__wirecrypt_key = 335545066)
+ INTEGER*4 GDS__wirecrypt_plugin
+ PARAMETER (GDS__wirecrypt_plugin = 335545067)
+ INTEGER*4 GDS__secdb_name
+ PARAMETER (GDS__secdb_name = 335545068)
+ INTEGER*4 GDS__auth_data
+ PARAMETER (GDS__auth_data = 335545069)
+ INTEGER*4 GDS__auth_datalength
+ PARAMETER (GDS__auth_datalength = 335545070)
INTEGER*4 GDS__gfix_db_name
PARAMETER (GDS__gfix_db_name = 335740929)
INTEGER*4 GDS__gfix_invalid_sw
Modified: firebird/trunk/lang_helpers/gds_codes.pas
===================================================================
--- firebird/trunk/lang_helpers/gds_codes.pas 2013-10-16 00:27:45 UTC (rev 58697)
+++ firebird/trunk/lang_helpers/gds_codes.pas 2013-10-16 12:53:04 UTC (rev 58698)
@@ -772,6 +772,17 @@
gds_include_miss = 335545057;
gds_protect_ownership = 335545058;
gds_badvarnum = 335545059;
+ gds_sec_context = 335545060;
+ gds_multi_segment = 335545061;
+ gds_login_changed = 335545062;
+ gds_auth_handshake_limit = 335545063;
+ gds_wirecrypt_incompatible = 335545064;
+ gds_miss_wirecrypt = 335545065;
+ gds_wirecrypt_key = 335545066;
+ gds_wirecrypt_plugin = 335545067;
+ gds_secdb_name = 335545068;
+ gds_auth_data = 335545069;
+ gds_auth_datalength = 335545070;
gds_gfix_db_name = 335740929;
gds_gfix_invalid_sw = 335740930;
gds_gfix_incmp_sw = 335740932;
Modified: firebird/trunk/src/auth/SecureRemotePassword/client/SrpClient.cpp
===================================================================
--- firebird/trunk/src/auth/SecureRemotePassword/client/SrpClient.cpp 2013-10-16 00:27:45 UTC (rev 58697)
+++ firebird/trunk/src/auth/SecureRemotePassword/client/SrpClient.cpp 2013-10-16 12:53:04 UTC (rev 58698)
@@ -79,17 +79,18 @@
}
HANDSHAKE_DEBUG(fprintf(stderr, "Cli: SRP phase2\n"));
- unsigned int length;
+ unsigned length;
const unsigned char* saltAndKey = cb->getData(&length);
if (!saltAndKey || length == 0)
{
- (Arg::Gds(isc_random) << "Missing data from server").raise();
+ Arg::Gds(isc_auth_data).raise();
}
- if (length > (RemotePassword::SRP_SALT_SIZE + RemotePassword::SRP_KEY_SIZE + 2) * 2)
+ const unsigned expectedLength =
+ (RemotePassword::SRP_SALT_SIZE + RemotePassword::SRP_KEY_SIZE + 2) * 2;
+ if (length > expectedLength)
{
- string msg;
- msg.printf("Wrong length (%d) of data from server", length);
- (Arg::Gds(isc_random) << msg).raise();
+ (Arg::Gds(isc_auth_datalength) << Arg::Num(length) <<
+ Arg::Num(expectedLength) << "data").raise();
}
string salt, key;
@@ -97,9 +98,8 @@
charSize += ((unsigned) *saltAndKey++) << 8;
if (charSize > RemotePassword::SRP_SALT_SIZE * 2)
{
- string msg;
- msg.printf("Wrong length (%d) of salt from server", charSize);
- (Arg::Gds(isc_random) << msg).raise();
+ (Arg::Gds(isc_auth_datalength) << Arg::Num(charSize) <<
+ Arg::Num(RemotePassword::SRP_SALT_SIZE * 2) << "salt").raise();
}
salt.assign(saltAndKey, charSize);
dumpIt("Clnt: salt", salt);
@@ -108,11 +108,10 @@
charSize = *saltAndKey++;
charSize += ((unsigned) *saltAndKey++) << 8;
- if (charSize + 2 != length)
+ if (charSize != length - 2)
{
- string msg;
- msg.printf("Wrong length (%d) of key from server", charSize);
- (Arg::Gds(isc_random) << msg).raise();
+ (Arg::Gds(isc_auth_datalength) << Arg::Num(charSize) <<
+ Arg::Num(length - 2) << "key").raise();
}
key.assign(saltAndKey, charSize);
dumpIt("Clnt: key(srvPub)", key);
Modified: firebird/trunk/src/auth/SecureRemotePassword/manage/SrpManagement.cpp
===================================================================
--- firebird/trunk/src/auth/SecureRemotePassword/manage/SrpManagement.cpp 2013-10-16 00:27:45 UTC (rev 58697)
+++ firebird/trunk/src/auth/SecureRemotePassword/manage/SrpManagement.cpp 2013-10-16 12:53:04 UTC (rev 58698)
@@ -183,7 +183,7 @@
if (!(secDbName && secDbName[0]))
{
- (Firebird::Arg::Gds(isc_random) << "Error getting security database name").raise();
+ Firebird::Arg::Gds(isc_secdb_name).raise();
}
Firebird::ClumpletWriter dpb(Firebird::ClumpletReader::dpbList, MAX_DPB_SIZE);
Modified: firebird/trunk/src/auth/SecureRemotePassword/server/SrpServer.cpp
===================================================================
--- firebird/trunk/src/auth/SecureRemotePassword/server/SrpServer.cpp 2013-10-16 00:27:45 UTC (rev 58697)
+++ firebird/trunk/src/auth/SecureRemotePassword/server/SrpServer.cpp 2013-10-16 12:53:04 UTC (rev 58698)
@@ -99,6 +99,7 @@
unsigned int length;
const unsigned char* val = sb->getData(&length);
clientPubKey.assign(val, length);
+ dumpBin("Srv: clientPubKey", clientPubKey);
if (!clientPubKey.hasData())
{
@@ -116,7 +117,7 @@
secDbName = config->asString(secDbKey);
if (!(secDbName && secDbName[0]))
{
- (Arg::Gds(isc_random) << "Error getting security database name").raise();
+ Arg::Gds(isc_secdb_name).raise();
}
ClumpletWriter dpb(ClumpletReader::dpbList, MAX_DPB_SIZE);
@@ -221,14 +222,13 @@
data += char(serverPubKey.length() >> 8);
data.append(serverPubKey);
dumpIt("Srv: serverPubKey", serverPubKey);
- dumpIt("Srv: data", data);
+ dumpBin("Srv: data", data);
sb->putData(status, data.length(), data.c_str());
if (!status->isSuccess())
{
return AUTH_FAILED;
}
- dumpIt("Srv: clientPubKey", clientPubKey);
server->serverSessionKey(sessionKey, clientPubKey.c_str(), verifier);
dumpIt("Srv: sessionKey", sessionKey);
Modified: firebird/trunk/src/auth/SecureRemotePassword/srp.cpp
===================================================================
--- firebird/trunk/src/auth/SecureRemotePassword/srp.cpp 2013-10-16 00:27:45 UTC (rev 58697)
+++ firebird/trunk/src/auth/SecureRemotePassword/srp.cpp 2013-10-16 12:53:04 UTC (rev 58698)
@@ -213,6 +213,14 @@
fprintf(stderr, "%s: '%s'\n", name, str.c_str());
}
+void dumpBin(const char* name, const Firebird::string& str)
+{
+ fprintf(stderr, "%s (%ld)\n", name, str.length());
+ for (size_t x=0; x<str.length(); ++x)
+ fprintf(stderr, "%02x ", str[x]);
+ fprintf(stderr, "\n");
+}
+
void dumpIt(const char* name, const BigInteger& bi)
{
string x;
Modified: firebird/trunk/src/auth/SecureRemotePassword/srp.h
===================================================================
--- firebird/trunk/src/auth/SecureRemotePassword/srp.h 2013-10-16 00:27:45 UTC (rev 58697)
+++ firebird/trunk/src/auth/SecureRemotePassword/srp.h 2013-10-16 12:53:04 UTC (rev 58698)
@@ -120,10 +120,12 @@
void dumpIt(const char* name, const Firebird::BigInteger& bi);
void dumpIt(const char* name, const Firebird::UCharBuffer& data);
void dumpIt(const char* name, const Firebird::string& str);
+void dumpBin(const char* name, const Firebird::string& str);
#else
void static inline dumpIt(const char* /*name*/, const Firebird::BigInteger& /*bi*/) { }
void static inline dumpIt(const char* /*name*/, const Firebird::UCharBuffer& /*data*/) { }
void static inline dumpIt(const char* /*name*/, const Firebird::string& /*str*/) { }
+void static inline dumpBin(const char* /*name*/, const Firebird::string& /*str*/) { }
#endif
Modified: firebird/trunk/src/auth/SecurityDatabase/LegacyManagement.epp
===================================================================
--- firebird/trunk/src/auth/SecurityDatabase/LegacyManagement.epp 2013-10-16 00:27:45 UTC (rev 58697)
+++ firebird/trunk/src/auth/SecurityDatabase/LegacyManagement.epp 2013-10-16 12:53:04 UTC (rev 58698)
@@ -143,7 +143,7 @@
if (!(secDbName && secDbName[0]))
{
- (Firebird::Arg::Gds(isc_random) << "Error getting security database name").raise();
+ Firebird::Arg::Gds(isc_secdb_name).raise();
}
Firebird::ClumpletWriter dpb(Firebird::ClumpletReader::dpbList, MAX_DPB_SIZE);
Modified: firebird/trunk/src/auth/SecurityDatabase/LegacyServer.cpp
===================================================================
--- firebird/trunk/src/auth/SecurityDatabase/LegacyServer.cpp 2013-10-16 00:27:45 UTC (rev 58697)
+++ firebird/trunk/src/auth/SecurityDatabase/LegacyServer.cpp 2013-10-16 12:53:04 UTC (rev 58698)
@@ -267,6 +267,10 @@
// Attach as SYSDBA
dpb.insertString(isc_dpb_trusted_auth, SYSDBA_USER_NAME, strlen(SYSDBA_USER_NAME));
+ // Do not use other providers except current engine
+ const char* providers = "Providers=" CURRENT_ENGINE;
+ dpb.insertString(isc_dpb_config, providers, strlen(providers));
+
isc_db_handle tempHandle = 0;
isc_attach_database(status, 0, secureDbName, &tempHandle,
dpb.getBufferLength(), reinterpret_cast<const char*>(dpb.getBuffer()));
@@ -307,7 +311,9 @@
return AUTH_CONTINUE;
}
- string login(sBlock->getLogin());
+ const char* user = sBlock->getLogin();
+ string login(user ? user : "");
+
unsigned length;
const unsigned char* data = sBlock->getData(&length);
string passwordEnc;
@@ -468,7 +474,7 @@
const char* tmp = config->asString(secDbKey);
if (!tmp)
{
- (Arg::Gds(isc_random) << "Error getting security database name").raise();
+ Arg::Gds(isc_secdb_name).raise();
}
secDbName = tmp;
Modified: firebird/trunk/src/burp/burp.cpp
===================================================================
--- firebird/trunk/src/burp/burp.cpp 2013-10-16 00:27:45 UTC (rev 58697)
+++ firebird/trunk/src/burp/burp.cpp 2013-10-16 12:53:04 UTC (rev 58698)
@@ -106,7 +106,7 @@
static ULONG get_size(const SCHAR*, burp_fil*);
static gbak_action open_files(const TEXT *, const TEXT**, bool, USHORT,
const Firebird::ClumpletWriter&);
-static int api_gbak(Firebird::UtilSvc*, const Switches& switches);
+static int svc_api_gbak(Firebird::UtilSvc*, const Switches& switches);
static void burp_output(bool err, const SCHAR*, ...) ATTRIBUTE_FORMAT(2,3);
static void burp_usage(const Switches& switches);
static Switches::in_sw_tab_t* findSwitchOrThrow(Switches& switches, Firebird::string& sw);
@@ -149,11 +149,11 @@
}
-static int api_gbak(Firebird::UtilSvc* uSvc, const Switches& switches)
+static int svc_api_gbak(Firebird::UtilSvc* uSvc, const Switches& switches)
{
/**********************************************
*
- * a p i _ g b a k
+ * s v c _ a p i _ g b a k
*
**********************************************
*
@@ -172,12 +172,18 @@
Firebird::UtilSvc::ArgvType& argv = uSvc->argv;
const int argc = uSvc->argv.getCount();
+ Firebird::string files[2];
+ unsigned fileIndex = 0;
for (int itr = 1; itr < argc; ++itr)
{
const Switches::in_sw_tab_t* inSw = switches.findSwitch(argv[itr]);
if (! inSw)
{
+ if (argv[itr][0] && fileIndex < 2)
+ {
+ files[fileIndex++] = argv[itr];
+ }
continue;
}
@@ -249,6 +255,8 @@
}
}
+ Firebird::string* dbName = flag_restore ? &files[1] : &files[0];
+
ISC_STATUS_ARRAY status;
FB_API_HANDLE svc_handle = 0;
@@ -269,6 +277,10 @@
{
spb.insertString(isc_spb_password, pswd);
}
+ if (dbName->hasData())
+ {
+ spb.insertString(isc_spb_expected_db, *dbName);
+ }
#ifdef TRUSTED_AUTH
if (flag_trusted)
{
@@ -450,7 +462,7 @@
// test for "-service" switch
if (switches.exists(IN_SW_BURP_SE, argv.begin(), 1, argc))
- return api_gbak(uSvc, switches);
+ return svc_api_gbak(uSvc, switches);
uSvc->started();
Modified: firebird/trunk/src/common/IntlParametersBlock.cpp
===================================================================
--- firebird/trunk/src/common/IntlParametersBlock.cpp 2013-10-16 00:27:45 UTC (rev 58697)
+++ firebird/trunk/src/common/IntlParametersBlock.cpp 2013-10-16 12:53:04 UTC (rev 58698)
@@ -186,6 +186,7 @@
case isc_spb_trusted_auth:
case isc_spb_trusted_role:
case isc_spb_process_name:
+ case isc_spb_expected_db:
return TAG_STRING;
case isc_spb_command_line:
Modified: firebird/trunk/src/common/classes/ClumpletReader.cpp
===================================================================
--- firebird/trunk/src/common/classes/ClumpletReader.cpp 2013-10-16 00:27:45 UTC (rev 58697)
+++ firebird/trunk/src/common/classes/ClumpletReader.cpp 2013-10-16 12:53:04 UTC (rev 58698)
@@ -877,4 +877,31 @@
return true;
}
+#ifdef AUTH_BLOCK_DEBUG
+void dumpAuthBlock(const char* text, ClumpletReader* pb, unsigned char param)
+{
+ fprintf(stderr, "AuthBlock in %s:", text);
+ if (pb->find(param))
+ {
+ Firebird::AuthReader::AuthBlock tmp;
+ tmp.assign(pb->getBytes(), pb->getClumpLength());
+ Firebird::AuthReader rdr(tmp);
+ string name, method;
+ PathName secureDb;
+ bool x = false;
+ while (rdr.getInfo(&name, &method, &secureDb))
+ {
+ fprintf(stderr, " %s::%s::%s", name.c_str(), method.c_str(), secureDb.c_str());
+ x = true;
+ rdr.moveNext();
+ }
+ fprintf(stderr, "%s\n", x ? "" : " <empty>");
+ }
+ else
+ {
+ fprintf(stderr, " <missing>\n");
+ }
+}
+#endif
+
} // namespace
Modified: firebird/trunk/src/common/classes/ClumpletReader.h
===================================================================
--- firebird/trunk/src/common/classes/ClumpletReader.h 2013-10-16 00:27:45 UTC (rev 58697)
+++ firebird/trunk/src/common/classes/ClumpletReader.h 2013-10-16 12:53:04 UTC (rev 58698)
@@ -201,6 +201,13 @@
bool getInfo(string* name, string* method, PathName* secDb);
};
+//#define AUTH_BLOCK_DEBUG
+#ifdef AUTH_BLOCK_DEBUG
+void dumpAuthBlock(const char* text, ClumpletReader* pb, unsigned char param);
+#else
+static inline void dumpAuthBlock(const char*, ClumpletReader*, unsigned char) { }
+#endif
+
} // namespace Firebird
#endif // CLUMPLETREADER_H
Modified: firebird/trunk/src/common/classes/array.h
===================================================================
--- firebird/trunk/src/common/classes/array.h 2013-10-16 00:27:45 UTC (rev 58697)
+++ firebird/trunk/src/common/classes/array.h 2013-10-16 12:53:04 UTC (rev 58698)
@@ -140,8 +140,15 @@
}
public:
- typedef T* iterator;
- typedef const T* const_iterator;
+ typedef size_t size_type;
+ typedef ptrdiff_t difference_type;
+ typedef T* pointer;
+ typedef const T* const_pointer;
+ typedef T& reference;
+ typedef const T& const_reference;
+ typedef T value_type;
+ typedef pointer iterator;
+ typedef const_pointer const_iterator;
Array<T, Storage>& operator =(const Array<T, Storage>& source)
{
Modified: firebird/trunk/src/common/classes/fb_string.h
===================================================================
--- firebird/trunk/src/common/classes/fb_string.h 2013-10-16 00:27:45 UTC (rev 58697)
+++ firebird/trunk/src/common/classes/fb_string.h 2013-10-16 12:53:04 UTC (rev 58698)
@@ -228,6 +228,10 @@
{
return stringLength;
}
+ size_type getCount() const
+ {
+ return stringLength;
+ }
// Almost same as c_str(), but return 0, not "",
// when string has no data. Useful when interacting
// with old code, which does check for NULL.
@@ -245,6 +249,10 @@
void reserve(size_type n = 0);
void resize(const size_type n, char_type c = ' ');
+ void grow(const size_type n)
+ {
+ resize(n);
+ }
pointer getBuffer(size_t l)
{
Modified: firebird/trunk/src/common/config/config.cpp
===================================================================
--- firebird/trunk/src/common/config/config.cpp 2013-10-16 00:27:45 UTC (rev 58697)
+++ firebird/trunk/src/common/config/config.cpp 2013-10-16 12:53:04 UTC (rev 58698)
@@ -121,9 +121,6 @@
const char* AmTrusted = "trusted";
const char* AmMixed = "mixed";
-const char* WIRE_CRYPT_DISABLED = "DISABLED";
-const char* WIRE_CRYPT_ENABLED = "ENABLED";
-const char* WIRE_CRYPT_REQUIRED = "REQUIRED";
const Config::ConfigEntry Config::entries[MAX_CONFIG_KEY] =
{
@@ -677,7 +674,7 @@
return (const char*) values[KEY_PLUG_KEY_HOLDER];
}
- (Firebird::Arg::Gds(isc_random) << "Internal error in Config::getPlugins()").raise();
+ (Firebird::Arg::Gds(isc_random) << "Internal error in Config::getPlugins(): unknown plugin type requested").raise();
return NULL; // compiler warning silencer
}
@@ -717,8 +714,19 @@
return get<const char*>(KEY_SECURITY_DATABASE);
}
-const char* Config::getWireCrypt(WireCryptMode wcMode) const
+int Config::getWireCrypt(WireCryptMode wcMode) const
{
- const char* rc = get<const char*>(KEY_WIRE_CRYPT);
- return rc ? rc : wcMode == WC_CLIENT ? WIRE_CRYPT_ENABLED : WIRE_CRYPT_REQUIRED;
+ const char* wc = get<const char*>(KEY_WIRE_CRYPT);
+ if (!wc)
+ {
+ return wcMode == WC_CLIENT ? WIRE_CRYPT_ENABLED : WIRE_CRYPT_REQUIRED;
+ }
+
+ Firebird::NoCaseString wireCrypt(wc);
+ if (wireCrypt == "DISABLED")
+ return WIRE_CRYPT_DISABLED;
+ else if (wireCrypt == "ENABLED")
+ return WIRE_CRYPT_ENABLED;
+ else // the safest choice
+ return WIRE_CRYPT_REQUIRED;
}
Modified: firebird/trunk/src/common/config/config.h
===================================================================
--- firebird/trunk/src/common/config/config.h 2013-10-16 00:27:45 UTC (rev 58697)
+++ firebird/trunk/src/common/config/config.h 2013-10-16 12:53:04 UTC (rev 58698)
@@ -75,9 +75,9 @@
enum AmCache {AM_UNKNOWN, AM_DISABLED, AM_ENABLED};
-extern const char* WIRE_CRYPT_DISABLED;
-extern const char* WIRE_CRYPT_ENABLED;
-extern const char* WIRE_CRYPT_REQUIRED;
+const int WIRE_CRYPT_DISABLED = 0;
+const int WIRE_CRYPT_ENABLED = 1;
+const int WIRE_CRYPT_REQUIRED = 2;
enum WireCryptMode {WC_CLIENT, WC_SERVER}; // Have different defaults
@@ -335,7 +335,7 @@
const char* getSecurityDatabase() const;
- const char* getWireCrypt(WireCryptMode wcMode) const;
+ int getWireCrypt(WireCryptMode wcMode) const;
};
// Implementation of interface to access master configuration file
Modified: firebird/trunk/src/include/consts_pub.h
===================================================================
--- firebird/trunk/src/include/consts_pub.h 2013-10-16 00:27:45 UTC (rev 58697)
+++ firebird/trunk/src/include/consts_pub.h 2013-10-16 12:53:04 UTC (rev 58698)
@@ -282,6 +282,7 @@
#define isc_spb_host_name 121
#define isc_spb_os_user 122
#define isc_spb_config 123
+#define isc_spb_expected_db 124
#define isc_spb_connect_timeout isc_dpb_connect_timeout
#define isc_spb_dummy_packet_interval isc_dpb_dummy_packet_interval
Modified: firebird/trunk/src/include/gen/codetext.h
===================================================================
--- firebird/trunk/src/include/gen/codetext.h 2013-10-16 00:27:45 UTC (rev 58697)
+++ firebird/trunk/src/include/gen/codetext.h 2013-10-16 12:53:04 UTC (rev 58698)
@@ -761,6 +761,17 @@
{"include_miss", 335545057},
{"protect_ownership", 335545058},
{"badvarnum", 335545059},
+ {"sec_context", 335545060},
+ {"multi_segment", 335545061},
+ {"login_changed", 335545062},
+ {"auth_handshake_limit", 335545063},
+ {"wirecrypt_incompatible", 335545064},
+ {"miss_wirecrypt", 335545065},
+ {"wirecrypt_key", 335545066},
+ {"wirecrypt_plugin", 335545067},
+ {"secdb_name", 335545068},
+ {"auth_data", 335545069},
+ {"auth_datalength", 335545070},
{"gfix_db_name", 335740929},
{"gfix_invalid_sw", 335740930},
{"gfix_incmp_sw", 335740932},
Modified: firebird/trunk/src/include/gen/iberror.h
===================================================================
--- firebird/trunk/src/include/gen/iberror.h 2013-10-16 00:27:45 UTC (rev 58697)
+++ firebird/trunk/src/include/gen/iberror.h 2013-10-16 12:53:04 UTC (rev 58698)
@@ -795,6 +795,17 @@
const ISC_STATUS isc_include_miss = 335545057L;
const ISC_STATUS isc_protect_ownership = 335545058L;
const ISC_STATUS isc_badvarnum = 335545059L;
+const ISC_STATUS isc_sec_context = 335545060L;
+const ISC_STATUS isc_multi_segment = 335545061L;
+const ISC_STATUS isc_login_changed = 335545062L;
+const ISC_STATUS isc_auth_handshake_limit = 335545063L;
+const ISC_STATUS isc_wirecrypt_incompatible = 335545064L;
+const ISC_STATUS isc_miss_wirecrypt = 335545065L;
+const ISC_STATUS isc_wirecrypt_key = 335545066L;
+const ISC_STATUS isc_wirecrypt_plugin = 335545067L;
+const ISC_STATUS isc_secdb_name = 335545068L;
+const ISC_STATUS isc_auth_data = 335545069L;
+const ISC_STATUS isc_auth_datalength = 335545070L;
const ISC_STATUS isc_gfix_db_name = 335740929L;
const ISC_STATUS isc_gfix_invalid_sw = 335740930L;
const ISC_STATUS isc_gfix_incmp_sw = 335740932L;
@@ -1239,7 +1250,7 @@
const ISC_STATUS isc_trace_switch_param_miss = 337182758L;
const ISC_STATUS isc_trace_param_act_notcompat = 337182759L;
const ISC_STATUS isc_trace_mandatory_switch_miss = 337182760L;
-const ISC_STATUS isc_err_max = 1183;
+const ISC_STATUS isc_err_max = 1194;
#else /* c definitions */
@@ -2004,6 +2015,17 @@
#define isc_include_miss 335545057L
#define isc_protect_ownership 335545058L
#define isc_badvarnum 335545059L
+#define isc_sec_context 335545060L
+#define isc_multi_segment 335545061L
+#define isc_login_changed 335545062L
+#define isc_auth_handshake_limit 335545063L
+#define isc_wirecrypt_incompatible 335545064L
+#define isc_miss_wirecrypt 335545065L
+#define isc_wirecrypt_key 335545066L
+#define isc_wirecrypt_plugin 335545067L
+#define isc_secdb_name 335545068L
+#define isc_auth_data 335545069L
+#define isc_auth_datalength 335545070L
#define isc_gfix_db_name 335740929L
#define isc_gfix_invalid_sw 335740930L
#define isc_gfix_incmp_sw 335740932L
@@ -2448,7 +2470,7 @@
#define isc_trace_switch_param_miss 337182758L
#define isc_trace_param_act_notcompat 337182759L
#define isc_trace_mandatory_switch_miss 337182760L
-#define isc_err_max 1183
+#define isc_err_max 1194
#endif
Modified: firebird/trunk/src/include/gen/msgs.h
===================================================================
--- firebird/trunk/src/include/gen/msgs.h 2013-10-16 00:27:45 UTC (rev 58697)
+++ firebird/trunk/src/include/gen/msgs.h 2013-10-16 12:53:04 UTC (rev 58698)
@@ -764,6 +764,17 @@
{335545057, "File to include not found"}, /* include_miss */
{335545058, "Only the owner can change the ownership"}, /* protect_ownership */
{335545059, "undefined variable number"}, /* badvarnum */
+ {335545060, "Missing security context for database @1"}, /* sec_context */
+ {335545061, "Missing segment @1 in multisegment connect block parameter"}, /* multi_segment */
+ {335545062, "Different logins in connect and attach packets - client library error"}, /* login_changed */
+ {335545063, "Exceeded exchange limit during authentication handshake"}, /* auth_handshake_limit */
+ {335545064, "Incompatible wire encryption levels requested on client and server"}, /* wirecrypt_incompatible */
+ {335545065, "Client attempted to attach unencrypted but wire encryption is required"}, /* miss_wirecrypt */
+ {335545066, "Client attempted to start wire encryption using unknown key @1"}, /* wirecrypt_key */
+ {335545067, "Client attempted to start wire encryption using unsupported plugin @1"}, /* wirecrypt_plugin */
+ {335545068, "Error getting security database name from configuration file"}, /* secdb_name */
+ {335545069, "Client authentication plugin is missing required data from server"}, /* auth_data */
+ {335545070, "Client authentication plugin expected @2 bytes of @3 from server, got @1"}, /* auth_datalength */
{335740929, "data base file name (@1) already given"}, /* gfix_db_name */
{335740930, "invalid switch @1"}, /* gfix_invalid_sw */
{335740932, "incompatible switch combination"}, /* gfix_incmp_sw */
Modified: firebird/trunk/src/include/gen/sql_code.h
===================================================================
--- firebird/trunk/src/include/gen/sql_code.h 2013-10-16 00:27:45 UTC (rev 58697)
+++ firebird/trunk/src/include/gen/sql_code.h 2013-10-16 12:53:04 UTC (rev 58698)
@@ -760,6 +760,17 @@
{335545057, -902}, /* 737 include_miss */
{335545058, -552}, /* 738 protect_ownership */
{335545059, -901}, /* 739 badvarnum */
+ {335545060, -902}, /* 740 sec_context */
+ {335545061, -902}, /* 741 multi_segment */
+ {335545062, -902}, /* 742 login_changed */
+ {335545063, -902}, /* 743 auth_handshake_limit */
+ {335545064, -902}, /* 744 wirecrypt_incompatible */
+ {335545065, -902}, /* 745 miss_wirecrypt */
+ {335545066, -902}, /* 746 wirecrypt_key */
+ {335545067, -902}, /* 747 wirecrypt_plugin */
+ {335545068, -902}, /* 748 secdb_name */
+ {335545069, -902}, /* 749 auth_data */
+ {335545070, -902}, /* 750 auth_datalength */
{335740929, -901}, /* 1 gfix_db_name */
{335740930, -901}, /* 2 gfix_invalid_sw */
{335740932, -901}, /* 4 gfix_incmp_sw */
Modified: firebird/trunk/src/include/gen/sql_state.h
===================================================================
--- firebird/trunk/src/include/gen/sql_state.h 2013-10-16 00:27:45 UTC (rev 58697)
+++ firebird/trunk/src/include/gen/sql_state.h 2013-10-16 12:53:04 UTC (rev 58698)
@@ -760,6 +760,17 @@
{335545057, "XX000"}, // 737 include_miss
{335545058, "28000"}, // 738 protect_ownership
{335545059, "HY000"}, // 739 badvarnum
+ {335545060, "28000"}, // 740 sec_context
+ {335545061, "28000"}, // 741 multi_segment
+ {335545062, "28000"}, // 742 login_changed
+ {335545063, "28000"}, // 743 auth_handshake_limit
+ {335545064, "28000"}, // 744 wirecrypt_incompatible
+ {335545065, "28000"}, // 745 miss_wirecrypt
+ {335545066, "28000"}, // 746 wirecrypt_key
+ {335545067, "28000"}, // 747 wirecrypt_plugin
+ {335545068, "28000"}, // 748 secdb_name
+ {335545069, "28000"}, // 749 auth_data
+ {335545070, "28000"}, // 750 auth_datalength
{335740929, "00000"}, // 1 gfix_db_name
{335740930, "00000"}, // 2 gfix_invalid_sw
{335740932, "00000"}, // 4 gfix_incmp_sw
Modified: firebird/trunk/src/jrd/jrd.cpp
===================================================================
--- firebird/trunk/src/jrd/jrd.cpp 2013-10-16 00:27:45 UTC (rev 58697)
+++ firebird/trunk/src/jrd/jrd.cpp 2013-10-16 12:53:04 UTC (rev 58698)
@@ -946,7 +946,7 @@
static bool shutdown_database(Database*, const bool);
static void strip_quotes(string&);
static void purge_attachment(thread_db*, JAttachment*, const bool);
-static void getUserInfo(UserId&, const DatabaseOptions&, const RefPtr<Config>*);
+static void getUserInfo(UserId&, const DatabaseOptions&, const char*, const RefPtr<Config>*);
static THREAD_ENTRY_DECLARE shutdown_thread(THREAD_ENTRY_PARAM);
@@ -955,7 +955,7 @@
m_filename(filename),
m_options(options)
{
- getUserInfo(m_id, *m_options, NULL);
+ getUserInfo(m_id, *m_options, m_filename, NULL);
}
@@ -1276,7 +1276,7 @@
}
// Check for correct credentials supplied
- getUserInfo(userId, options, &config);
+ getUserInfo(userId, options, org_filename.c_str(), &config);
}
catch (const Exception& ex)
{
@@ -2363,7 +2363,7 @@
}
// Check for correct credentials supplied
- getUserInfo(userId, options, &config);
+ getUserInfo(userId, options, org_filename.c_str(), &config);
}
catch (const Exception& ex)
{
@@ -5462,6 +5462,7 @@
}
ClumpletReader rdr(ClumpletReader::dpbList, dpb, dpb_length, dpbErrorRaise);
+ dumpAuthBlock("DatabaseOptions::get()", &rdr, isc_dpb_auth_block);
dpb_utf8_filename = rdr.find(isc_dpb_utf8_filename);
@@ -6941,7 +6942,8 @@
@param
**/
-static void getUserInfo(UserId& user, const DatabaseOptions& options, const RefPtr<Config>* config)
+static void getUserInfo(UserId& user, const DatabaseOptions& options,
+ const char* dbName, const RefPtr<Config>* config)
{
bool wheel = false;
int id = -1, group = -1; // CVC: This var contained trash
@@ -6974,7 +6976,7 @@
{
if (config && (secureDb != (*config)->getSecurityDatabase()))
{
- (Arg::Gds(isc_login) << Arg::Gds(isc_random) << "No SecDb match").raise();
+ (Arg::Gds(isc_sec_context) << dbName).raise();
}
}
else
Modified: firebird/trunk/src/jrd/svc.cpp
===================================================================
--- firebird/trunk/src/jrd/svc.cpp 2013-10-16 00:27:45 UTC (rev 58697)
+++ firebird/trunk/src/jrd/svc.cpp 2013-10-16 12:53:04 UTC (rev 58698)
@@ -756,6 +756,7 @@
// Process the service parameter block.
ClumpletReader spb(ClumpletReader::spbList, spb_data, spb_length, spbVersionError);
+ dumpAuthBlock("Jrd::Service() ctor", &spb, isc_spb_auth_block);
getOptions(spb);
// Perhaps checkout the user in the security database.
Modified: firebird/trunk/src/msgs/facilities2.sql
===================================================================
--- firebird/trunk/src/msgs/facilities2.sql 2013-10-16 00:27:45 UTC (rev 58697)
+++ firebird/trunk/src/msgs/facilities2.sql 2013-10-16 12:53:04 UTC (rev 58698)
@@ -1,7 +1,7 @@
/* MAX_NUMBER is the next number to be used, always one more than the highest message number. */
set bulk_insert INSERT INTO FACILITIES (LAST_CHANGE, FACILITY, FAC_CODE, MAX_NUMBER) VALUES (?, ?, ?, ?);
--
-('2013-09-04 11:02:00', 'JRD', 0, 740)
+('2013-10-15 17:48:59', 'JRD', 0, 751)
('2012-01-23 20:10:30', 'QLI', 1, 532)
('2009-07-16 05:26:11', 'GFIX', 3, 121)
('1996-11-07 13:39:40', 'GPRE', 4, 1)
Modified: firebird/trunk/src/msgs/messages2.sql
===================================================================
--- firebird/trunk/src/msgs/messages2.sql 2013-10-16 00:27:45 UTC (rev 58697)
+++ firebird/trunk/src/msgs/messages2.sql 2013-10-16 12:53:04 UTC (rev 58698)
@@ -847,6 +847,17 @@
('include_miss', NULL, 'config_file.cpp', NULL, 0, 737, NULL, 'File to include not found', NULL, NULL);
('protect_ownership', 'check_owner', 'vio.cpp', NULL, 0, 738, NULL, 'Only the owner can change the ownership', NULL, NULL);
('badvarnum', NULL, NULL, NULL, 0, 739, NULL, 'undefined variable number', NULL, NULL);
+('sec_context', 'getUserInfo', 'jrd.cpp', NULL, 0, 740, NULL, 'Missing security context for database @1', NULL, NULL);
+('multi_segment', 'getMultiPartConnectParameter', 'server.cpp', NULL, 0, 741, NULL, 'Missing segment @1 in multisegment connect block parameter', NULL, NULL);
+('login_changed', 'ServerAuth::ServerAuth', 'server.cpp', NULL, 0, 742, NULL, 'Different logins in connect and attach packets - client library error', NULL, NULL);
+('auth_handshake_limit', 'ServerAuth::authenticate', 'server.cpp', NULL, 0, 743, NULL, 'Exceeded exchange limit during authentication handshake', NULL, NULL);
+('wirecrypt_incompatible', 'requiredEncryption', 'server.cpp', NULL, 0, 744, NULL, 'Incompatible wire encryption levels requested on client and server', NULL, NULL);
+('miss_wirecrypt', NULL, 'server.cpp', NULL, 0, 745, NULL, 'Client attempted to attach unencrypted but wire encryption is required', NULL, NULL);
+('wirecrypt_key', 'start_crypt', 'server.cpp', NULL, 0, 746, NULL, 'Client attempted to start wire encryption using unknown key @1', NULL, NULL);
+('wirecrypt_plugin', 'start_crypt', 'server.cpp', NULL, 0, 747, NULL, 'Client attempted to start wire encryption using unsupported plugin @1', NULL, NULL);
+('secdb_name', NULL, NULL, NULL, 0, 748, NULL, 'Error getting security database name from configuration file', NULL, NULL);
+('auth_data', NULL, NULL, NULL, 0, 749, NULL, 'Client authentication plugin is missing required data from server', NULL, NULL);
+('auth_datalength', NULL, NULL, NULL, 0, 750, NULL, 'Client authentication plugin expected @2 bytes of @3 from server, got @1', NULL, NULL);
-- QLI
(NULL, NULL, NULL, NULL, 1, 0, NULL, 'expected type', NULL, NULL);
(NULL, NULL, NULL, NULL, 1, 1, NULL, 'bad block type', NULL, NULL);
Modified: firebird/trunk/src/msgs/system_errors2.sql
===================================================================
--- firebird/trunk/src/msgs/system_errors2.sql 2013-10-16 00:27:45 UTC (rev 58697)
+++ firebird/trunk/src/msgs/system_errors2.sql 2013-10-16 12:53:04 UTC (rev 58698)
@@ -746,6 +746,17 @@
(-902, 'XX', '000', 0, 737, 'include_miss', NULL, NULL)
(-552, '28', '000', 0, 738, 'protect_ownership', NULL, NULL)
(-901, 'HY', '000', 0, 739, 'badvarnum', NULL, NULL)
+(-902, '28', '000', 0, 740, 'sec_context', NULL, NULL);
+(-902, '28', '000', 0, 741, 'multi_segment', NULL, NULL);
+(-902, '28', '000', 0, 742, 'login_changed', NULL, NULL);
+(-902, '28', '000', 0, 743, 'auth_handshake_limit', NULL, NULL);
+(-902, '28', '000', 0, 744, 'wirecrypt_incompatible', NULL, NULL);
+(-902, '28', '000', 0, 745, 'miss_wirecrypt', NULL, NULL);
+(-902, '28', '000', 0, 746, 'wirecrypt_key', NULL, NULL);
+(-902, '28', '000', 0, 747, 'wirecrypt_plugin', NULL, NULL);
+(-902, '28', '000', 0, 748, 'secdb_name', NULL, NULL);
+(-902, '28', '000', 0, 749, 'auth_data', NULL, NULL);
+(-902, '28', '000', 0, 750, 'auth_datalength', NULL, NULL);
-- GFIX
(-901, '00', '000', 3, 1, 'gfix_db_name', NULL, NULL)
(-901, '00', '000', 3, 2, 'gfix_invalid_sw', NULL, NULL)
Modified: firebird/trunk/src/remote/client/interface.cpp
===================================================================
--- firebird/trunk/src/remote/client/interface.cpp 2013-10-16 00:27:45 UTC (rev 58697)
+++ firebird/trunk/src/remote/client/interface.cpp 2013-10-16 12:53:04 UTC (rev 58698)
@@ -661,8 +661,8 @@
static Rvnt* add_event(rem_port*);
static void add_other_params(rem_port*, ClumpletWriter&, const ParametersSet&);
static void add_working_directory(ClumpletWriter&, const PathName&);
-static rem_port* analyze(ClntAuthBlock&, PathName&, bool, ClumpletWriter&, PathName&, bool);
-static rem_port* analyze_service(ClntAuthBlock&, PathName&, bool, ClumpletReader&, bool);
+static rem_port* analyze(ClntAuthBlock& cBlock, PathName& attach_name, unsigned flags,
+ ClumpletWriter& pb, const ParametersSet& parSet, PathName& node_name, PathName* ref_db_name);
static void batch_gds_receive(rem_port*, struct rmtque *, USHORT);
static void batch_dsql_fetch(rem_port*, struct rmtque *, USHORT);
static void clear_queue(rem_port*);
@@ -674,7 +674,7 @@
static Rvnt* find_event(rem_port*, SLONG);
static bool get_new_dpb(ClumpletWriter&, const ParametersSet&);
static void info(IStatus*, Rdb*, P_OP, USHORT, USHORT, USHORT,
- const UCHAR*, USHORT, const UCHAR*, ULONG, UCHAR*, ClntAuthBlock* cBlock = NULL);
+ const UCHAR*, USHORT, const UCHAR*, ULONG, UCHAR*);
static void init(IStatus*, ClntAuthBlock&, rem_port*, P_OP, PathName&,
ClumpletWriter&, IntlParametersBlock&, ICryptKeyCallback* cryptCallback);
static Rtr* make_transaction(Rdb*, USHORT);
@@ -702,14 +702,17 @@
static void unsupported();
static void zap_packet(PACKET *);
static void cleanDpb(Firebird::ClumpletWriter&, const ParametersSet*);
-
static void authFillParametersBlock(ClntAuthBlock& authItr, ClumpletWriter& dpb,
const ParametersSet* tags, rem_port* port);
-static void authReceiveResponse(ClntAuthBlock& authItr, rem_port* port, Rdb* rdb,
- IStatus* status, PACKET* packet, bool checkKeys);
+static void authReceiveResponse(bool havePacket, ClntAuthBlock& authItr, rem_port* port,
+ Rdb* rdb, IStatus* status, PACKET* packet, bool checkKeys);
static AtomicCounter remote_event_id;
+static const unsigned ANALYZE_UV = 0x01;
+static const unsigned ANALYZE_LOOPBACK = 0x02;
+static const unsigned ANALYZE_MOUNTS = 0x03;
+
inline static void reset(IStatus* status) throw()
{
status->init();
@@ -753,13 +756,17 @@
reset(status);
ClumpletWriter newDpb(ClumpletReader::dpbList, MAX_DPB_SIZE, dpb, dpb_length);
- const bool user_verification = get_new_dpb(newDpb, dpbParam);
+ unsigned flags = ANALYZE_MOUNTS;
+ if (get_new_dpb(newDpb, dpbParam))
+ flags |= ANALYZE_UV;
+ if (loopback)
+ flags |= ANALYZE_LOOPBACK;
PathName expanded_name(filename);
PathName node_name;
ClntAuthBlock cBlock(&expanded_name, &newDpb, &dpbParam);
- rem_port* port = analyze(cBlock, expanded_name, user_verification, newDpb, node_name, loopback);
+ rem_port* port = analyze(cBlock, expanded_name, flags, newDpb, dpbParam, node_name, NULL);
if (!port)
{
@@ -770,13 +777,13 @@
RefMutexGuard portGuard(*port->port_sync, FB_FUNCTION);
// The client may have set a parameter for dummy_packet_interval. Add that to the
- // the DPB so the server can pay attention to it. Note: allocation code must
- // ensure sufficient space has been added.
+ // the DPB so the server can pay attention to it.
add_other_params(port, newDpb, dpbParam);
add_working_directory(newDpb, node_name);
IntlDpb intl;
+ HANDSHAKE_DEBUG(fprintf(stderr, "Cli: call init for DB='%s'\n", expanded_name.c_str()));
init(status, cBlock, port, op_attach, expanded_name, newDpb, intl, cryptCallback);
Attachment* a = new Attachment(port->port_context, filename);
@@ -1336,13 +1343,17 @@
ClumpletWriter newDpb(ClumpletReader::dpbList, MAX_DPB_SIZE,
reinterpret_cast<const UCHAR*>(dpb), dpb_length);
- const bool user_verification = get_new_dpb(newDpb, dpbParam);
+ unsigned flags = ANALYZE_MOUNTS;
+ if (get_new_dpb(newDpb, dpbParam))
+ flags |= ANALYZE_UV;
+ if (loopback)
+ flags |= ANALYZE_LOOPBACK;
PathName expanded_name(filename);
PathName node_name;
ClntAuthBlock cBlock(&expanded_name, &newDpb, &dpbParam);
- rem_port* port = analyze(cBlock, expanded_name, user_verification, newDpb, node_name, loopback);
+ rem_port* port = analyze(cBlock, expanded_name, flags, newDpb, dpbParam, node_name, NULL);
if (!port)
{
@@ -4560,15 +4571,26 @@
{
reset(status);
- PathName expanded_name(service);
+ PathName node_name, expanded_name(service);
ClumpletWriter newSpb(ClumpletReader::spbList, MAX_DPB_SIZE, spb, spbLength);
const bool user_verification = get_new_dpb(newSpb, spbParam);
ClntAuthBlock cBlock(NULL, &newSpb, &spbParam);
- cBlock.loadClnt(newSpb, &spbParam);
- rem_port* port = analyze_service(cBlock, expanded_name, user_verification, newSpb, loopback);
+ unsigned flags = 0;
+ if (get_new_dpb(newSpb, spbParam))
+ flags |= ANALYZE_UV;
+ if (loopback)
+ flags |= ANALYZE_LOOPBACK;
+ PathName refDbName;
+ if (newSpb.find(isc_spb_expected_db))
+ {
+ newSpb.getPath(refDbName);
+ }
+
+ rem_port* port = analyze(cBlock, expanded_name, flags, newSpb, spbParam, node_name, &refDbName);
+
RefMutexGuard portGuard(*port->port_sync, FB_FUNCTION);
Rdb* rdb = port->port_context;
@@ -4581,8 +4603,6 @@
IntlSpb intl;
init(status, cBlock, port, op_service_attach, expanded_name, newSpb, intl, cryptCallback);
- cBlock.saveServiceDataTo(port);
-
Firebird::IService* s = new Service(rdb);
s->addRef();
return s;
@@ -4718,12 +4738,9 @@
rem_port* port = rdb->rdb_port;
RefMutexGuard portGuard(*port->port_sync, FB_FUNCTION);
- ClntAuthBlock cBlock(NULL, NULL, NULL);
- cBlock.loadServiceDataFrom(port);
-
info(status, rdb, op_service_info, rdb->rdb_id, 0,
sendLength, sendItems, receiveLength, receiveItems,
- bufferLength, buffer, &cBlock);
+ bufferLength, buffer);
}
catch (const Exception& ex)
{
@@ -5322,13 +5339,34 @@
}
-static rem_port* analyze(ClntAuthBlock& cBlock,
- PathName& file_name,
- bool uv_flag,
- ClumpletWriter& dpb,
- PathName& node_name,
- bool loopback)
+static void secureAuthentication(ClntAuthBlock& cBlock, rem_port* port)
{
+ HANDSHAKE_DEBUG(fprintf(stderr, "Cli: secureAuthentication\n"));
+
+ if (!port)
+ return;
+
+ Rdb* rdb = port->port_context;
+ fb_assert(rdb);
+ PACKET* packet = &rdb->rdb_packet;
+
+ HANDSHAKE_DEBUG(fprintf(stderr, "Cli: secureAuthentication: port OK, op=%d\n", packet->p_operation));
+
+ if (packet->p_operation == op_cond_accept)
+ {
+ LocalStatus st;
+ authReceiveResponse(true, cBlock, port, rdb, &st, packet, true);
+ if (!st.isSuccess())
+ {
+ status_exception::raise(st.get());
+ }
+ }
+}
+
+
+static rem_port* analyze(ClntAuthBlock& cBlock, PathName& attach_name, unsigned flags,
+ ClumpletWriter& pb, const ParametersSet& parSet, PathName& node_name, PathName* ref_db_name)
+{
/**************************************
*
* a n a l y z e
@@ -5336,9 +5374,9 @@
**************************************
*
* Functional description
- * Analyze a file specification and determine whether
+ * Analyze an attach specification and determine whether
* a remote server is required, and if so, what protocol
- * to use. If the database can be accessed via the
+ * to use. If the target can be accessed via the
* remote subsystem, return address of a port block
* with which to communicate with the server.
* Otherwise, return NULL.
@@ -5347,196 +5385,140 @@
*
**************************************/
- // Analyze the file name to see if a remote connection is required. If not,
- // quietly (sic) return.
+ rem_port* port = NULL;
- cBlock.loadClnt(dpb, &dpbParam);
+ try
+ {
+ cBlock.loadClnt(pb, &parSet);
authenticateStep0(cBlock);
- rem_port* port = NULL;
#ifdef WIN_NT
- if (ISC_analyze_protocol(PROTOCOL_XNET, file_name, node_name))
+ if (ISC_analyze_protocol(PROTOCOL_XNET, attach_name, node_name))
{
- port = XNET_analyze(&cBlock, file_name, uv_flag, cBlock.getConfig());
+ port = XNET_analyze(&cBlock, attach_name, flags & ANALYZE_UV, cBlock.getConfig(), ref_db_name);
}
- else if (ISC_analyze_protocol(PROTOCOL_WNET, file_name, node_name) ||
- ISC_analyze_pclan(file_name, node_name))
+ else if (ISC_analyze_protocol(PROTOCOL_WNET, attach_name, node_name) ||
+ ISC_analyze_pclan(attach_name, node_name))
{
if (node_name.isEmpty())
+ {
node_name = WNET_LOCALHOST;
+ }
else
{
ISC_unescape(node_name);
ISC_utf8ToSystem(node_name);
}
-
- port = WNET_analyze(&cBlock, file_name, node_name.c_str(), uv_flag, cBlock.getConfig());
+ port = WNET_analyze(&cBlock, attach_name, node_name.c_str(), flags & ANALYZE_UV,
+ cBlock.getConfig(), ref_db_name);
}
else
#endif
- if (ISC_analyze_protocol(PROTOCOL_INET, file_name, node_name) ||
- ISC_analyze_tcp(file_name, node_name))
+ if (ISC_analyze_protocol(PROTOCOL_INET, attach_name, node_name) ||
+ ISC_analyze_tcp(attach_name, node_name))
{
if (node_name.isEmpty())
+ {
node_name = INET_LOCALHOST;
+ }
else
{
ISC_unescape(node_name);
ISC_utf8ToSystem(node_name);
}
-
- port = INET_analyze(&cBlock, file_name, node_name.c_str(), uv_flag, dpb, cBlock.getConfig());
+ port = INET_analyze(&cBlock, attach_name, node_name.c_str(), flags & ANALYZE_UV, pb,
+ cBlock.getConfig(), ref_db_name);
}
// We have a local connection string. If it's a file on a network share,
// try to connect to the corresponding host remotely.
+ if (flags & ANALYZE_MOUNTS)
+ {
#ifdef WIN_NT
- PathName expanded_name = file_name;
- ISC_expand_share(expanded_name);
+ if (!port)
+ {
+ PathName expanded_name = attach_name;
+ ISC_expand_share(expanded_name);
- if (ISC_analyze_pclan(expanded_name, node_name))
- {
- ISC_unescape(node_name);
- ISC_utf8ToSystem(node_name);
+ if (ISC_analyze_pclan(expanded_name, node_name))
+ {
+ ISC_unescape(node_name);
+ ISC_utf8ToSystem(node_name);
- port = WNET_analyze(&cBlock, expanded_name, node_name.c_str(), uv_flag, cBlock.getConfig());
- }
+ port = WNET_analyze(&cBlock, expanded_name, node_name.c_str(), flags & ANALYZE_UV,
+ cBlock.getConfig(), ref_db_name);
+ }
+ }
#endif
#ifndef NO_NFS
- if (!port)
- {
- PathName expanded_name = file_name;
- if (ISC_analyze_nfs(expanded_name, node_name))
+ if (!port)
{
- ISC_unescape(node_name);
- ISC_utf8ToSystem(node_name);
+ PathName expanded_name = attach_name;
+ if (ISC_analyze_nfs(expanded_name, node_name))
+ {
+ ISC_unescape(node_name);
+ ISC_utf8ToSystem(node_name);
- port = INET_analyze(&cBlock, expanded_name, node_name.c_str(), uv_flag, dpb, cBlock.getConfig());
+ port = INET_analyze(&cBlock, expanded_name, node_name.c_str(), flags & ANALYZE_UV, pb,
+ cBlock.getConfig(), ref_db_name);
+ }
}
+#endif
}
-#endif
- if (loopback)
+ if ((flags & ANALYZE_LOOPBACK) && !port)
{
- // We still have a local connection string but failed to connect so far.
- // If we're a pure client, attempt connect to the localhost.
+ // We have a local connection string.
+ // If we are in loopback mode attempt connect to a localhost.
if (node_name.isEmpty())
{
#ifdef WIN_NT
if (!port)
{
- port = XNET_analyze(&cBlock, file_name, uv_flag, cBlock.getConfig());
+ port = XNET_analyze(&cBlock, attach_name, flags & ANALYZE_UV, cBlock.getConfig(), ref_db_name);
}
if (!port)
{
- port = WNET_analyze(&cBlock, file_name, WNET_LOCALHOST, uv_flag, cBlock.getConfig());
+ port = WNET_analyze(&cBlock, attach_name, WNET_LOCALHOST, flags & ANALYZE_UV,
+ cBlock.getConfig(), ref_db_name);
}
#endif
if (!port)
{
- port = INET_analyze(&cBlock, file_name, INET_LOCALHOST, uv_flag, dpb, cBlock.getConfig());
+ port = INET_analyze(&cBlock, attach_name, INET_LOCALHOST, flags & ANALYZE_UV, pb,
+ cBlock.getConfig(), ref_db_name);
}
}
}
-
- return port;
-}
-
-
-static rem_port* analyze_service(ClntAuthBlock& cBlock,
- PathName& service_name,
- bool uv_flag,
- ClumpletReader& spb,
- bool loopback)
-{
-/**************************************
- *
- * a n a l y z e _ s e r v i c e
- *
- **************************************
- *
- * Functional description
- * Analyze a service specification and determine whether
- * a remote server is required, and if so, what protocol
- * to use. If the database can be accessed via the
- * remote subsystem, return address of a port block
- * with which to communicate with the server.
- * Otherwise, return NULL.
- *
- **************************************/
- // Analyze the service name to see if a remote connection is required. If not,
- // quietly (sic) return.
-
- PathName node_name;
-
-#if defined(WIN_NT)
- if (ISC_analyze_protocol(PROTOCOL_XNET, service_name, node_name))
+ if (!port)
{
- return XNET_analyze(NULL, service_name, uv_flag, cBlock.getConfig());
+ Arg::Gds(isc_unavailable).raise();
}
- if (ISC_analyze_protocol(PROTOCOL_WNET, service_name, node_name) ||
- ISC_analyze_pclan(service_name, node_name))
+ secureAuthentication(cBlock, port);
+ }
+ catch (const status_exception& ex)
+ {
+ const ISC_STATUS* s = ex.value();
+ if (s[1] != isc_unavailable)
{
- if (node_name.isEmpty())
- {
- node_name = WNET_LOCALHOST;
- }
- return WNET_analyze(NULL, service_name, node_name.c_str(), uv_flag, cBlock.getConfig());
+ (Arg::Gds(isc_unavailable) << Arg::StatusVector(s)).raise();
}
-#endif
-
- if (ISC_analyze_protocol(PROTOCOL_INET, service_name, node_name) ||
- ISC_analyze_tcp(service_name, node_name))
+ else
{
- if (node_name.isEmpty())
- {
- node_name = INET_LOCALHOST;
- }
- return INET_analyze(NULL, service_name, node_name.c_str(), uv_flag, spb, cBlock.getConfig());
+ throw;
}
+ }
- rem_port* port = NULL;
+ return port;
+}
- if (loopback)
- {
- // We have a local connection string. If we're a pure client,
- // attempt connect to a localhost.
-
- if (node_name.isEmpty())
- {
-#if defined(WIN_NT)
- if (!port)
- {
- port = XNET_analyze(NULL, service_name, uv_flag, cBlock.getConfig());
- }
-
- if (!port)
- {
- port = WNET_analyze(NULL, service_name, WNET_LOCALHOST, uv_flag, cBlock.getConfig());
- }
-#endif
- if (!port)
- {
- port = INET_analyze(NULL, service_name, INET_LOCALHOST, uv_flag, spb, cBlock.getConfig());
- }
- }
- }
-
- if (!port)
- {
- Arg::Gds(isc_unavailable).raise();
- }
-
- return port;
-}
-
static void clear_stmt_que(rem_port* port, Rsr* statement)
{
/**************************************
@@ -6095,8 +6077,7 @@
USHORT recv_item_length,
const UCHAR* recv_items,
ULONG buffer_length,
- UCHAR* buffer,
- ClntAuthBlock* cBlock)
+ UCHAR* buffer)
{
/**************************************
*
@@ -6136,18 +6117,7 @@
try
{
- if (operation == op_service_info)
- {
- // Probably communicate with services auth
- fb_assert(cBlock);
- HANDSHAKE_DEBUG(fprintf(stderr, "Cli: info() calls authReceiveResponse\n"));
- authReceiveResponse(*cBlock, rdb->rdb_port, rdb, status, packet, false);
- }
- else
- {
- // Just get response from server
- receive_response(status, rdb, packet);
- }
+ receive_response(status, rdb, packet);
}
catch (const Exception&)
{
@@ -6162,6 +6132,11 @@
static void authFillParametersBlock(ClntAuthBlock& cBlock, ClumpletWriter& dpb,
const ParametersSet* tags, rem_port* port)
{
+ if (cBlock.authComplete)
+ {
+ return; // Already authenticated
+ }
+
LocalStatus s;
cBlock.resetDataFromPlugin();
@@ -6231,15 +6206,23 @@
}
}
-static void authReceiveResponse(ClntAuthBlock& cBlock, rem_port* port, Rdb* rdb,
- IStatus* status, PACKET* packet, bool checkKeys)
+static void authReceiveResponse(bool havePacket, ClntAuthBlock& cBlock, rem_port* port,
+ Rdb* rdb, IStatus* status, PACKET* packet, bool checkKeys)
{
LocalStatus s;
for (;;)
{
// Get response
- receive_packet(port, packet);
+ if (!havePacket)
+ {
+ receive_packet(port, packet);
+ }
+ else
+ {
+ fb_assert(packet->p_operation == op_cond_accept);
+ }
+ havePacket = false; // havePacket means first packet is already received
// Check response
cstring* n = NULL;
@@ -6256,11 +6239,20 @@
d = &packet->p_auth_cont.p_data;
n = &packet->p_auth_cont.p_name;
port->addServerKeys(&packet->p_auth_cont.p_keys);
- HANDSHAKE_DEBUG(fprintf(stderr, "Cli: authReceiveResponse: ont_auth d=%d n=%d '%.*s' 0x%x\n",
+ HANDSHAKE_DEBUG(fprintf(stderr, "Cli: authReceiveResponse: cont_auth d=%d n=%d '%.*s' 0x%x\n",
d->cstr_length, n->cstr_length,
n->cstr_length, n->cstr_address, n->cstr_address ? n->cstr_address[0] : 0));
break;
+ case op_cond_accept:
+ d = &packet->p_acpd.p_acpt_data;
+ n = &packet->p_acpd.p_acpt_plugin;
+ port->addServerKeys(&packet->p_acpd.p_acpt_keys);
+ HANDSHAKE_DEBUG(fprintf(stderr, "Cli: authReceiveResponse: cond_accept d=%d n=%d '%.*s' 0x%x\n",
+ d->cstr_length, n->cstr_length,
+ n->cstr_length, n->cstr_address, n->cstr_address ? n->cstr_address[0] : 0));
+ break;
+
case op_crypt:
fb_assert(!checkKeys);
{
@@ -6285,6 +6277,7 @@
REMOTE_check_response(status, rdb, packet, checkKeys);
// successfully attached
HANDSHAKE_DEBUG(fprintf(stderr, "Cli: authReceiveResponse: OK!\n"));
+ cBlock.authComplete = true;
rdb->rdb_id = packet->p_resp.p_resp_object;
// try to start crypt
@@ -6392,7 +6385,7 @@
send_packet(port, packet);
- authReceiveResponse(cBlock, port, rdb, status, packet, true);
+ authReceiveResponse(false, cBlock, port, rdb, status, packet, true);
}
catch (const Exception&)
{
@@ -6681,67 +6674,71 @@
// Receive responses for all deferred packets that were already sent
Rdb* rdb = port->port_context;
- while (port->port_deferred_packets->getCount())
+
+ if (port->port_deferred_packets)
{
- rem_que_packet* const p = port->port_deferred_packets->begin();
- if (!p->sent)
- break;
+ while (port->port_deferred_packets->getCount())
+ {
+ rem_que_packet* const p = port->port_deferred_packets->begin();
+ if (!p->sent)
+ break;
- OBJCT stmt_id = 0;
- bool bCheckResponse = false, bFreeStmt = false;
+ OBJCT stmt_id = 0;
+ bool bCheckResponse = false, bFreeStmt = false;
- if (p->packet.p_operation == op_execute)
- {
- stmt_id = p->packet.p_sqldata.p_sqldata_statement;
- bCheckResponse = true;
- }
- else if (p->packet.p_operation == op_free_statement)
- {
- stmt_id = p->packet.p_sqlfree.p_sqlfree_statement;
- bFreeStmt = (p->packet.p_sqlfree.p_sqlfree_option == DSQL_drop);
- }
+ if (p->packet.p_operation == op_execute)
+ {
+ stmt_id = p->packet.p_sqldata.p_sqldata_statement;
+ bCheckResponse = true;
+ }
+ else if (p->packet.p_operation == op_free_statement)
+ {
+ stmt_id = p->packet.p_sqlfree.p_sqlfree_statement;
+ bFreeStmt = (p->packet.p_sqlfree.p_sqlfree_option == DSQL_drop);
+ }
- receive_packet_with_callback(port, &p->packet);
+ receive_packet_with_callback(port, &p->packet);
- Rsr* statement = NULL;
- if (bCheckResponse || bFreeStmt)
- {
- statement = port->port_objects[stmt_id];
- }
-
- if (bCheckResponse)
- {
- bool bAssign = true;
- try
+ Rsr* statement = NULL;
+ if (bCheckResponse || bFreeStmt)
{
- LocalStatus status;
- REMOTE_check_response(&status, rdb, &p->packet);
- statement->saveException(status.get(), false);
+ statement = port->port_objects[stmt_id];
}
- catch (const Exception& ex)
+
+ if (bCheckResponse)
{
- // save error within the corresponding statement
- statement->saveException(ex, false);
- bAssign = false;
+ bool bAssign = true;
+ try
+ {
+ LocalStatus status;
+ REMOTE_check_response(&status, rdb, &p->packet);
+ statement->saveException(status.get(), false);
+ }
+ catch (const Exception& ex)
+ {
+ // save error within the corresponding statement
+ statement->saveException(ex, false);
+ bAssign = false;
+ }
+
+ if (bAssign)
+ {
+ // assign statement to transaction
+ const OBJCT tran_id = p->packet.p_sqldata.p_sqldata_transaction;
+ Rtr* transaction = port->port_objects[tran_id];
+ statement->rsr_rtr = transaction;
+ }
}
- if (bAssign)
+ if (bFreeStmt && p->packet.p_resp.p_resp_object == INVALID_OBJECT)
{
- // assign statement to transaction
- const OBJCT tran_id = p->packet.p_sqldata.p_sqldata_transaction;
- Rtr* transaction = port->port_objects[tran_id];
- statement->rsr_rtr = transaction;
+ release_sql_request(statement);
}
- }
- if (bFreeStmt && p->packet.p_resp.p_resp_object == INVALID_OBJECT)
- {
- release_sql_request(statement);
+ // free only part of packet we worked...
[truncated message content] |
|
From: <fir...@us...> - 2013-10-17 00:30:11
|
Revision: 58699
http://sourceforge.net/p/firebird/code/58699
Author: firebirds
Date: 2013-10-17 00:30:08 +0000 (Thu, 17 Oct 2013)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2013-10-16 12:53:04 UTC (rev 58698)
+++ firebird/trunk/ChangeLog 2013-10-17 00:30:08 UTC (rev 58699)
@@ -1,3 +1,56 @@
+ 2013-10-16 12:53 alexpeshkoff
+ M doc/README.services_extension
+ M lang_helpers/gds_codes.ftn
+ M lang_helpers/gds_codes.pas
+ M src/auth/SecureRemotePassword/client/SrpClient.cpp
+ M src/auth/SecureRemotePassword/manage/SrpManagement.cpp
+ M src/auth/SecureRemotePassword/server/SrpServer.cpp
+ M src/auth/SecureRemotePassword/srp.cpp
+ M src/auth/SecureRemotePassword/srp.h
+ M src/auth/SecurityDatabase/LegacyManagement.epp
+ M src/auth/SecurityDatabase/LegacyServer.cpp
+ M src/burp/burp.cpp
+ M src/common/IntlParametersBlock.cpp
+ M src/common/classes/ClumpletReader.cpp
+ M src/common/classes/ClumpletReader.h
+ M src/common/classes/array.h
+ M src/common/classes/fb_string.h
+ M src/common/config/config.cpp
+ M src/common/config/config.h
+ M src/include/consts_pub.h
+ M src/include/gen/codetext.h
+ M src/include/gen/iberror.h
+ M src/include/gen/msgs.h
+ M src/include/gen/sql_code.h
+ M src/include/gen/sql_state.h
+ M src/jrd/jrd.cpp
+ M src/jrd/svc.cpp
+ M src/msgs/facilities2.sql
+ M src/msgs/messages2.sql
+ M src/msgs/system_errors2.sql
+ M src/remote/client/interface.cpp
+ M src/remote/inet.cpp
+ M src/remote/inet_proto.h
+ M src/remote/os/win32/wnet.cpp
+ M src/remote/os/win32/wnet_proto.h
+ M src/remote/os/win32/xnet.cpp
+ M src/remote/os/win32/xnet_proto.h
+ M src/remote/protocol.cpp
+ M src/remote/protocol.h
+ M src/remote/remot_proto.h
+ M src/remote/remote.cpp
+ M src/remote/remote.h
+ M src/remote/server/server.cpp
+ M src/utilities/fbsvcmgr/fbsvcmgr.cpp
+ M src/utilities/gsec/gsec.cpp
+ M src/yvalve/YObjects.h
+ M src/yvalve/utl.cpp
+ M src/yvalve/why.cpp
+Fix found by Jim Starkey man-in-themiddle attack on ATTACH packet.
+That packet may contain database name, command line for service and/or some other important and critical information.
+To avoid such attack wire encryption is started before attaching database or service manager, right after connect.
+Also should fix a number of issues found in Alpha1 regarding services attach.
+
2013-10-15 15:26 asfernandes
M src/common/CharSet.h
M src/common/TextType.cpp
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2013-10-16 12:53:04 UTC (rev 58698)
+++ firebird/trunk/src/jrd/build_no.h 2013-10-17 00:30:08 UTC (rev 58699)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:30683
+ FORMAL BUILD NUMBER:30684
*/
-#define PRODUCT_VER_STRING "3.0.0.30683"
-#define FILE_VER_STRING "WI-T3.0.0.30683"
-#define LICENSE_VER_STRING "WI-T3.0.0.30683"
-#define FILE_VER_NUMBER 3, 0, 0, 30683
+#define PRODUCT_VER_STRING "3.0.0.30684"
+#define FILE_VER_STRING "WI-T3.0.0.30684"
+#define LICENSE_VER_STRING "WI-T3.0.0.30684"
+#define FILE_VER_NUMBER 3, 0, 0, 30684
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "30683"
+#define FB_BUILD_NO "30684"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 1"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2013-10-16 12:53:04 UTC (rev 58698)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2013-10-17 00:30:08 UTC (rev 58699)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=30683
+BuildNum=30684
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ale...@us...> - 2013-10-17 16:08:16
|
Revision: 58703
http://sourceforge.net/p/firebird/code/58703
Author: alexpeshkoff
Date: 2013-10-17 16:08:13 +0000 (Thu, 17 Oct 2013)
Log Message:
-----------
Avoid deprecated macros in configure.ac. Use autoconf 2.69 as basic for FB3.
Modified Paths:
--------------
firebird/trunk/autogen.sh
firebird/trunk/configure.ac
Modified: firebird/trunk/autogen.sh
===================================================================
--- firebird/trunk/autogen.sh 2013-10-17 15:56:28 UTC (rev 58702)
+++ firebird/trunk/autogen.sh 2013-10-17 16:08:13 UTC (rev 58703)
@@ -25,7 +25,7 @@
VER=`$AUTORECONF --version|grep '^[Aa]utoreconf'|sed 's/^[^0-9]*//'`
case "$VER" in
0* | 1\.* | 2\.[0-9] | 2\.[0-9][a-z]* | \
- 2\.[1-5][0-9] | 2\.[1-5][0-9][a-z]* | 2\.6[0-2] | 2\.6[0-2][a-z]* )
+ 2\.[1-5][0-9] | 2\.[1-5][0-9][a-z]* | 2\.6[0-8] | 2\.6[0-8][a-z]* )
echo
echo "**Error**: You must have autoconf 2.63 or later installed."
echo "Download the appropriate package for your distribution/OS,"
Modified: firebird/trunk/configure.ac
===================================================================
--- firebird/trunk/configure.ac 2013-10-17 15:56:28 UTC (rev 58702)
+++ firebird/trunk/configure.ac 2013-10-17 16:08:13 UTC (rev 58703)
@@ -1,7 +1,8 @@
dnl ############################# INITIALISATION ###############################
-AC_PREREQ(2.56)
-AC_INIT(src)
+AC_PREREQ([2.69])
+AC_INIT
+AC_CONFIG_SRCDIR([src])
AC_CONFIG_AUX_DIR(builds/make.new/config)
AC_CACHE_VAL(ac_cv_prog_make_set, [AC_PROG_MAKE_SET])
@@ -23,7 +24,7 @@
dnl XE_CONF_DIR(param, help, variable, default)
define([XE_CONF_DIR],[
AC_ARG_WITH([$1],
- [AC_HELP_STRING([--with-$1], [$2])],
+ [AS_HELP_STRING([--with-$1],[$2])],
[[$3]="$withval"
AC_DEFINE_UNQUOTED([$3], "$[$3]", [$2])],
[[$3]="[`if test ""x$prefix"" = ""xNONE"" ; then echo ""$ac_default_prefix""; else echo ""$prefix""; fi`][$4]"
@@ -34,7 +35,7 @@
define([XE_CONF_FILE],[
AC_ARG_WITH([$1],
- [AC_HELP_STRING([--with-$1], [$2])],
+ [AS_HELP_STRING([--with-$1],[$2])],
[[$3]="$withval"
AC_DEFINE_UNQUOTED([$3], "$[$3]", [$2])],
[[$3]="$4"
@@ -60,8 +61,8 @@
dnl ############################# ADD TESTS BELOW ##############################
-AC_CANONICAL_SYSTEM
-CPU_TYPE=$target_cpu
+AC_CANONICAL_BUILD
+CPU_TYPE=$build_cpu
AC_SUBST(CPU_TYPE)
@@ -82,7 +83,7 @@
dnl Test for special ar options?
AR_OPT_CHECK=false
-case "$target" in
+case "$build" in
x*64-*-darwin*)
MAKEFILE_PREFIX=darwin_x86_64
MAKEFILE_POSTFIX=darwin
@@ -144,7 +145,7 @@
amd64-*-freebsd* | x86_64*-*-freebsd* | x86_64*-*-k*bsd*-gnu)
MAKEFILE_PREFIX=freebsd_amd64
- case "$target" in
+ case "$build" in
x86_64*-*-k*bsd-gnu) # Debian/kFreeBSD
PLATFORM=GENTOOFREEBSD
INSTALL_PREFIX=linux
@@ -170,7 +171,7 @@
*-*-freebsd* | *-*-k*bsd*-gnu)
MAKEFILE_PREFIX=freebsd
- case "$target" in
+ case "$build" in
*-*-k*bsd-gnu) # Debian/kFreeBSD
PLATFORM=GENTOOFREEBSD
INSTALL_PREFIX=linux
@@ -403,7 +404,7 @@
dnl inline assembly for atomic operations on Solaris 9 w SSPRO
PTHREAD_CFLAGS=-mt
PTHREAD_LIBS=-lpthread
- if test "${target#*solaris}" = "2.9"; then
+ if test "${build#*solaris}" = "2.9"; then
ATOMIC_OPTIONS=`pwd`"/src/common/classes/fb_atomic.il";
fi
;;
@@ -428,7 +429,7 @@
;;
*)
- AC_MSG_ERROR(unsupported platform ${target})
+ AC_MSG_ERROR(unsupported platform ${build})
;;
esac
@@ -620,10 +621,8 @@
AC_PROG_CPP
AC_PROG_INSTALL
AC_PROG_LN_S
-AC_LIBTOOL_DLOPEN
-AC_LIBTOOL_WIN32_DLL
AC_PROG_MAKE_SET
-AC_PROG_LIBTOOL
+LT_INIT([dlopen win32-dll])
dnl Check for system header files
AC_HEADER_DIRENT
@@ -745,12 +744,9 @@
AC_CHECK_FUNCS(gettimeofday)
if test "$ac_cv_func_gettimeofday" = "yes"; then
AC_MSG_CHECKING(if gettimeofday accepts second (timezone) argument)
- AC_TRY_COMPILE([#include <sys/time.h>],
- [struct timeval tp; gettimeofday(&tp, (struct timezone *)0);],
- [AC_DEFINE(GETTIMEOFDAY_RETURNS_TIMEZONE, 1,
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/time.h>]], [[struct timeval tp; gettimeofday(&tp, (struct timezone *)0);]])],[AC_DEFINE(GETTIMEOFDAY_RETURNS_TIMEZONE, 1,
[Define this if gettimeofday accepts second (timezone) argument])
- AC_MSG_RESULT(yes)],
- [AC_MSG_RESULT(no)])
+ AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)])
AH_BOTTOM([#ifdef GETTIMEOFDAY_RETURNS_TIMEZONE
#define GETTIMEOFDAY(x) gettimeofday((x), (struct timezone *)0)
#else
@@ -783,13 +779,10 @@
AC_CHECK_FUNCS(setmntent getmntent)
if test "$ac_cv_func_getmntent" = "yes"; then
AC_MSG_CHECKING(if getmntent needs second argument)
- AC_TRY_COMPILE([#include <stdio.h>
-#include <sys/mnttab.h>],
- [FILE *f; struct mntent *m; getmntent(f, m);],
- [AC_DEFINE(GETMNTENT_TAKES_TWO_ARGUMENTS, 1,
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>
+#include <sys/mnttab.h>]], [[FILE *f; struct mntent *m; getmntent(f, m);]])],[AC_DEFINE(GETMNTENT_TAKES_TWO_ARGUMENTS, 1,
[Define this if getmntent needs second argument])
- AC_MSG_RESULT(yes)],
- [AC_MSG_RESULT(no)])
+ AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)])
fi
AC_CHECK_FUNCS(setrlimit getrlimit)
AC_CHECK_FUNCS(tcgetattr strdup)
@@ -835,16 +828,14 @@
AC_CHECK_FUNCS(sem_init)
if test "$ac_cv_func_sem_init" = "yes"; then
AC_MSG_CHECKING(for working sem_init())
-AC_TRY_RUN([#include <semaphore.h>
+AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <semaphore.h>
main () {
sem_t s;
exit(sem_init(&s,0,0));
}
- ],
-[AC_DEFINE(WORKING_SEM_INIT,1,[Define this if sem_init() works on the platform])
-AC_MSG_RESULT(yes)],
-[AC_MSG_RESULT(no)
-AC_SEARCH_LIBS(sem_open, rt)])
+ ]])],[AC_DEFINE(WORKING_SEM_INIT,1,[Define this if sem_init() works on the platform])
+AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)
+AC_SEARCH_LIBS(sem_open, rt)],[])
fi
fi
@@ -863,20 +854,17 @@
dnl Checks for typedefs, structures, and compiler characteristics.
AC_C_BIGENDIAN
AC_C_VOLATILE
-AC_TYPE_SIGNAL
AC_TYPE_OFF_T
AC_TYPE_SIZE_T
AC_TYPE_UID_T
AC_SYS_LARGEFILE
if test "$ac_cv_sys_file_offset_bits" = "no"; then
AC_MSG_CHECKING(for native large file support)
- AC_TRY_RUN([#include <unistd.h>
+ AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <unistd.h>
main () {
exit(!(sizeof(off_t) == 8));
- }],
- [ac_cv_sys_file_offset_bits=64; AC_DEFINE(_FILE_OFFSET_BITS,64)
- AC_MSG_RESULT(yes)],
- [AC_MSG_RESULT(no)])
+ }]])],[ac_cv_sys_file_offset_bits=64; AC_DEFINE(_FILE_OFFSET_BITS,64)
+ AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)],[])
fi
AC_CHECK_SIZEOF(void *)
@@ -892,12 +880,9 @@
AC_CHECK_TYPES([semun])
if test "$ac_cv_type_semun" = "no"; then
AC_MSG_CHECKING(if sem.h defines semun)
- AC_TRY_COMPILE([#include <sys/types.h>
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
#include <sys/ipc.h>
- #include <sys/sem.h>],
- [union semun s;],
- [ac_cv_type_semun=yes; AC_DEFINE(HAVE_SEMUN) AC_MSG_RESULT(yes)],
- [AC_MSG_RESULT(no)])
+ #include <sys/sem.h>]], [[union semun s;]])],[ac_cv_type_semun=yes; AC_DEFINE(HAVE_SEMUN) AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)])
fi
AC_CHECK_TYPES([struct XDR::xdr_ops],,,[#include <rpc/rpc.h>
@@ -913,24 +898,24 @@
dnl EKU: try to determine the alignment of long and double
dnl replaces FB_ALIGNMENT and FB_DOUBLE_ALIGN in src/jrd/common.h
AC_MSG_CHECKING(alignment of long)
-AC_TRY_RUN([main () {
+AC_RUN_IFELSE([AC_LANG_SOURCE([[main () {
struct s {
char a;
long long b;
};
exit((int)&((struct s*)0)->b);
-}], ac_cv_c_alignment=$ac_status, ac_cv_c_alignment=$ac_status)
+}]])],[ac_cv_c_alignment=$ac_status],[ac_cv_c_alignment=$ac_status],[])
AC_MSG_RESULT($ac_cv_c_alignment)
AC_DEFINE_UNQUOTED(FB_ALIGNMENT, $ac_cv_c_alignment, [Alignment of long])
AC_MSG_CHECKING(alignment of double)
-AC_TRY_RUN([main () {
+AC_RUN_IFELSE([AC_LANG_SOURCE([[main () {
struct s {
char a;
double b;
};
exit((int)&((struct s*)0)->b);
-}], ac_cv_c_double_align=$ac_status, ac_cv_c_double_align=$ac_status)
+}]])],[ac_cv_c_double_align=$ac_status],[ac_cv_c_double_align=$ac_status],[])
AC_MSG_RESULT($ac_cv_c_double_align)
AC_DEFINE_UNQUOTED(FB_DOUBLE_ALIGN, $ac_cv_c_double_align, [Alignment of double])
@@ -959,11 +944,8 @@
dnl the AC_CHECK_TYPES for socklen_t doesn't include sys/socket.h
dnl so test for socklen_t with sys/socket.h included
AC_MSG_CHECKING(if sys/socket.h defines socklen_t)
- AC_TRY_COMPILE([#include <sys/types.h>
- #include <sys/socket.h>],
- [socklen_t s;],
- [AC_DEFINE(HAVE_SOCKLEN_T) AC_MSG_RESULT(yes)],
- [AC_MSG_RESULT(no)])
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
+ #include <sys/socket.h>]], [[socklen_t s;]])],[AC_DEFINE(HAVE_SOCKLEN_T) AC_MSG_RESULT(yes)],[AC_MSG_RESULT(no)])
;;
SOLARIS|solx86)
@@ -974,8 +956,7 @@
AC_CHECK_TYPES([caddr_t])
AC_ARG_WITH(sfio,
- AC_HELP_STRING([--with-sfio=PATH],
- [use sfio (replacement stdio on Solaris) (default=no)]),
+ AS_HELP_STRING([--with-sfio=PATH],[use sfio (replacement stdio on Solaris) (default=no)]),
[ac_cv_use_sfio=$withval],[ac_cv_use_sfio=no])
if test "$ac_cv_use_sfio" = "no"; then
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2013-10-18 02:27:17
|
Revision: 58704
http://sourceforge.net/p/firebird/code/58704
Author: firebirds
Date: 2013-10-18 02:27:13 +0000 (Fri, 18 Oct 2013)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2013-10-17 16:08:13 UTC (rev 58703)
+++ firebird/trunk/ChangeLog 2013-10-18 02:27:13 UTC (rev 58704)
@@ -1,3 +1,26 @@
+ 2013-10-17 16:08 alexpeshkoff
+ M autogen.sh
+ M configure.ac
+Avoid deprecated macros in configure.ac. Use autoconf 2.69 as basic for FB3.
+
+ 2013-10-17 15:56 alexpeshkoff
+ D extern/editline/Makefile.am
+ M extern/editline/Makefile.in
+ M extern/editline/configure
+ D extern/editline/src/Makefile.am
+ M extern/editline/src/Makefile.in
+Avoid automake dependency which caused people a lot of problems
+
+ 2013-10-17 15:42 asfernandes
+ M src/isql/extract.epp
+ M src/isql/show.epp
+1) Fixed some bugs with show/extract related to packages.
+2) Cleanup related to multiple ODS, now using possible non-existent fields in older ODS which will return NULL.
+
+ 2013-10-17 13:22 alexpeshkoff
+ M examples/interfaces/04.print_table.cpp
+Very strange that it compiled and worked as expected with 2 unused and unneded lines of code
+
2013-10-16 12:53 alexpeshkoff
M doc/README.services_extension
M lang_helpers/gds_codes.ftn
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2013-10-17 16:08:13 UTC (rev 58703)
+++ firebird/trunk/src/jrd/build_no.h 2013-10-18 02:27:13 UTC (rev 58704)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:30684
+ FORMAL BUILD NUMBER:30688
*/
-#define PRODUCT_VER_STRING "3.0.0.30684"
-#define FILE_VER_STRING "WI-T3.0.0.30684"
-#define LICENSE_VER_STRING "WI-T3.0.0.30684"
-#define FILE_VER_NUMBER 3, 0, 0, 30684
+#define PRODUCT_VER_STRING "3.0.0.30688"
+#define FILE_VER_STRING "WI-T3.0.0.30688"
+#define LICENSE_VER_STRING "WI-T3.0.0.30688"
+#define FILE_VER_NUMBER 3, 0, 0, 30688
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "30684"
+#define FB_BUILD_NO "30688"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 1"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2013-10-17 16:08:13 UTC (rev 58703)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2013-10-18 02:27:13 UTC (rev 58704)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=30684
+BuildNum=30688
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2013-10-19 00:29:45
|
Revision: 58709
http://sourceforge.net/p/firebird/code/58709
Author: firebirds
Date: 2013-10-19 00:29:43 +0000 (Sat, 19 Oct 2013)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2013-10-18 15:30:05 UTC (rev 58708)
+++ firebird/trunk/ChangeLog 2013-10-19 00:29:43 UTC (rev 58709)
@@ -1,3 +1,19 @@
+ 2013-10-18 15:30 alexpeshkoff
+ M src/auth/SecurityDatabase/LegacyServer.cpp
+Misc diag
+
+ 2013-10-18 12:36 alexpeshkoff
+ M configure.ac
+Enable use of older version of autoconf
+
+ 2013-10-18 12:35 alexpeshkoff
+ M autogen.sh
+Avoid duplicated version check
+
+ 2013-10-18 07:10 alexpeshkoff
+ M autogen.sh
+Fixed diagnostics
+
2013-10-17 16:08 alexpeshkoff
M autogen.sh
M configure.ac
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2013-10-18 15:30:05 UTC (rev 58708)
+++ firebird/trunk/src/jrd/build_no.h 2013-10-19 00:29:43 UTC (rev 58709)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:30688
+ FORMAL BUILD NUMBER:30692
*/
-#define PRODUCT_VER_STRING "3.0.0.30688"
-#define FILE_VER_STRING "WI-T3.0.0.30688"
-#define LICENSE_VER_STRING "WI-T3.0.0.30688"
-#define FILE_VER_NUMBER 3, 0, 0, 30688
+#define PRODUCT_VER_STRING "3.0.0.30692"
+#define FILE_VER_STRING "WI-T3.0.0.30692"
+#define LICENSE_VER_STRING "WI-T3.0.0.30692"
+#define FILE_VER_NUMBER 3, 0, 0, 30692
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "30688"
+#define FB_BUILD_NO "30692"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 1"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2013-10-18 15:30:05 UTC (rev 58708)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2013-10-19 00:29:43 UTC (rev 58709)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=30688
+BuildNum=30692
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2013-10-20 00:35:39
|
Revision: 58711
http://sourceforge.net/p/firebird/code/58711
Author: firebirds
Date: 2013-10-20 00:35:36 +0000 (Sun, 20 Oct 2013)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2013-10-19 08:09:51 UTC (rev 58710)
+++ firebird/trunk/ChangeLog 2013-10-20 00:35:36 UTC (rev 58711)
@@ -1,3 +1,8 @@
+ 2013-10-19 08:09 hvlad
+ M src/jrd/DatabaseSnapshot.cpp
+ M src/jrd/jrd.cpp
+Fixed two more reasons for CORE-4235 : Deadlock is possible while accessing the monitoring tables under concurrent load.
+
2013-10-18 15:30 alexpeshkoff
M src/auth/SecurityDatabase/LegacyServer.cpp
Misc diag
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2013-10-19 08:09:51 UTC (rev 58710)
+++ firebird/trunk/src/jrd/build_no.h 2013-10-20 00:35:36 UTC (rev 58711)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:30692
+ FORMAL BUILD NUMBER:30693
*/
-#define PRODUCT_VER_STRING "3.0.0.30692"
-#define FILE_VER_STRING "WI-T3.0.0.30692"
-#define LICENSE_VER_STRING "WI-T3.0.0.30692"
-#define FILE_VER_NUMBER 3, 0, 0, 30692
+#define PRODUCT_VER_STRING "3.0.0.30693"
+#define FILE_VER_STRING "WI-T3.0.0.30693"
+#define LICENSE_VER_STRING "WI-T3.0.0.30693"
+#define FILE_VER_NUMBER 3, 0, 0, 30693
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "30692"
+#define FB_BUILD_NO "30693"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 1"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2013-10-19 08:09:51 UTC (rev 58710)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2013-10-20 00:35:36 UTC (rev 58711)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=30692
+BuildNum=30693
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ale...@us...> - 2013-10-23 11:50:02
|
Revision: 58713
http://sourceforge.net/p/firebird/code/58713
Author: alexpeshkoff
Date: 2013-10-23 11:49:59 +0000 (Wed, 23 Oct 2013)
Log Message:
-----------
Avoid dependency from aclocal-1.12 in editline
Modified Paths:
--------------
firebird/trunk/builds/posix/Makefile.in.extern.editline
firebird/trunk/extern/editline/Makefile.in
firebird/trunk/extern/editline/src/Makefile.in
Modified: firebird/trunk/builds/posix/Makefile.in.extern.editline
===================================================================
--- firebird/trunk/builds/posix/Makefile.in.extern.editline 2013-10-23 11:06:52 UTC (rev 58712)
+++ firebird/trunk/builds/posix/Makefile.in.extern.editline 2013-10-23 11:49:59 UTC (rev 58713)
@@ -64,7 +64,7 @@
$(LIB)/libedit.a:
cd $(ROOT)/extern/editline; chmod +x configure; ./configure --enable-static --disable-shared --enable-widec
$(MAKE) -C $(ROOT)/extern/editline
- cp $(ROOT)/extern/editline/src/.libs/libedit.a $(LIB)
+ cp $(ROOT)/extern/editline/src/libedit.a $(LIB)
include $(ROOT)/gen/make.shared.targets
Modified: firebird/trunk/extern/editline/Makefile.in
===================================================================
--- firebird/trunk/extern/editline/Makefile.in 2013-10-23 11:06:52 UTC (rev 58712)
+++ firebird/trunk/extern/editline/Makefile.in 2013-10-23 11:49:59 UTC (rev 58713)
@@ -1,811 +1,6 @@
-# Makefile.in generated by automake 1.12.6 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2012 Free Software Foundation, Inc.
-
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
@SET_MAKE@
-VPATH = @srcdir@
-am__make_dryrun = \
- { \
- am__dry=no; \
- case $$MAKEFLAGS in \
- *\\[\ \ ]*) \
- echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
- | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
- *) \
- for am__flg in $$MAKEFLAGS; do \
- case $$am__flg in \
- *=*|--*) ;; \
- *n*) am__dry=yes; break;; \
- esac; \
- done;; \
- esac; \
- test $$am__dry = yes; \
- }
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = .
-DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
- $(srcdir)/Makefile.in $(srcdir)/config.h.in \
- $(srcdir)/libedit.pc.in $(top_srcdir)/configure COPYING \
- ChangeLog INSTALL THANKS compile config.guess config.sub \
- depcomp install-sh ltmain.sh missing
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
- $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
- $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno config.status.lineno
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES = libedit.pc
-CONFIG_CLEAN_VPATH_FILES =
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo " GEN " $@;
-am__v_GEN_1 =
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 =
-SOURCES =
-DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
- html-recursive info-recursive install-data-recursive \
- install-dvi-recursive install-exec-recursive \
- install-html-recursive install-info-recursive \
- install-pdf-recursive install-ps-recursive install-recursive \
- installcheck-recursive installdirs-recursive pdf-recursive \
- ps-recursive uninstall-recursive
-am__can_run_installinfo = \
- case $$AM_UPDATE_INFO_DIR in \
- n|no|NO) false;; \
- *) (install-info --version) >/dev/null 2>&1;; \
- esac
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- *) f=$$p;; \
- esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
- srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
- for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
- for p in $$list; do echo "$$p $$p"; done | \
- sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
- $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
- if (++n[$$2] == $(am__install_max)) \
- { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
- END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
- sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
- sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
- test -z "$$files" \
- || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
- || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
- $(am__cd) "$$dir" && rm -f $$files; }; \
- }
-am__installdirs = "$(DESTDIR)$(pkgconfigdir)"
-DATA = $(pkgconfig_DATA)
-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
- distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
- cscope distdir dist dist-all distcheck
-ETAGS = etags
-CTAGS = ctags
-CSCOPE = cscope
-DIST_SUBDIRS = $(SUBDIRS)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-distdir = $(PACKAGE)-$(VERSION)
-top_distdir = $(distdir)
-am__remove_distdir = \
- if test -d "$(distdir)"; then \
- find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
- && rm -rf "$(distdir)" \
- || { sleep 5 && rm -rf "$(distdir)"; }; \
- else :; fi
-am__post_remove_distdir = $(am__remove_distdir)
-am__relativize = \
- dir0=`pwd`; \
- sed_first='s,^\([^/]*\)/.*$$,\1,'; \
- sed_rest='s,^[^/]*/*,,'; \
- sed_last='s,^.*/\([^/]*\)$$,\1,'; \
- sed_butlast='s,/*[^/]*$$,,'; \
- while test -n "$$dir1"; do \
- first=`echo "$$dir1" | sed -e "$$sed_first"`; \
- if test "$$first" != "."; then \
- if test "$$first" = ".."; then \
- dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
- dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
- else \
- first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
- if test "$$first2" = "$$first"; then \
- dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
- else \
- dir2="../$$dir2"; \
- fi; \
- dir0="$$dir0"/"$$first"; \
- fi; \
- fi; \
- dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
- done; \
- reldir="$$dir2"
-DIST_ARCHIVES = $(distdir).tar.gz
-GZIP_ENV = --best
-DIST_TARGETS = dist-gzip
-distuninstallcheck_listfiles = find . -type f -print
-am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
- | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
-distcleancheck_listfiles = find . -type f -print
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
-DUMPBIN = @DUMPBIN@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GREP = @GREP@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-LT_VERSION = @LT_VERSION@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MANTYPE = @MANTYPE@
-MKDIR_P = @MKDIR_P@
-NM = @NM@
-NMEDIT = @NMEDIT@
-NROFF = @NROFF@
-OBJDUMP = @OBJDUMP@
-OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-RANLIB = @RANLIB@
-SED = @SED@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-VERSION = @VERSION@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-AUTOMAKE_OPTIONS = foreign
-ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = src
-EXTRA_DIST = libedit.pc.in
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libedit.pc
-all: config.h
- $(MAKE) $(AM_MAKEFLAGS) all-recursive
+all: editlinelibrary
-.SUFFIXES:
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- $(SHELL) ./config.status --recheck
-
-$(top_srcdir)/configure: $(am__configure_deps)
- $(am__cd) $(srcdir) && $(AUTOCONF)
-$(ACLOCAL_M4): $(am__aclocal_m4_deps)
- $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-$(am__aclocal_m4_deps):
-
-config.h: stamp-h1
- @if test ! -f $@; then rm -f stamp-h1; else :; fi
- @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi
-
-stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
- @rm -f stamp-h1
- cd $(top_builddir) && $(SHELL) ./config.status config.h
-$(srcdir)/config.h.in: $(am__configure_deps)
- ($(am__cd) $(top_srcdir) && $(AUTOHEADER))
- rm -f stamp-h1
- touch $@
-
-distclean-hdr:
- -rm -f config.h stamp-h1
-libedit.pc: $(top_builddir)/config.status $(srcdir)/libedit.pc.in
- cd $(top_builddir) && $(SHELL) ./config.status $@
-
-mostlyclean-libtool:
- -rm -f *.lo
-
-clean-libtool:
- -rm -rf .libs _libs
-
-distclean-libtool:
- -rm -f libtool config.lt
-install-pkgconfigDATA: $(pkgconfig_DATA)
- @$(NORMAL_INSTALL)
- @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
- if test -n "$$list"; then \
- echo " $(MKDIR_P) '$(DESTDIR)$(pkgconfigdir)'"; \
- $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" || exit 1; \
- fi; \
- for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- echo "$$d$$p"; \
- done | $(am__base_list) | \
- while read files; do \
- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgconfigdir)'"; \
- $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgconfigdir)" || exit $$?; \
- done
-
-uninstall-pkgconfigDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
- files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir)
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run 'make' without going through this Makefile.
-# To change the values of 'make' variables: instead of editing Makefiles,
-# (1) if the variable is set in 'config.status', edit 'config.status'
-# (which will cause the Makefiles to be regenerated when you run 'make');
-# (2) otherwise, pass the desired values on the 'make' command line.
-$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS):
- @fail= failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
- *k*) failcom='fail=yes';; \
- esac; \
- done; \
- dot_seen=no; \
- target=`echo $@ | sed s/-recursive//`; \
- case "$@" in \
- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
- *) list='$(SUBDIRS)' ;; \
- esac; \
- for subdir in $$list; do \
- echo "Making $$target in $$subdir"; \
- if test "$$subdir" = "."; then \
- dot_seen=yes; \
- local_target="$$target-am"; \
- else \
- local_target="$$target"; \
- fi; \
- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
- || eval $$failcom; \
- done; \
- if test "$$dot_seen" = "no"; then \
- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
- fi; test -z "$$fail"
-tags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
- done
-ctags-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
- done
-cscopelist-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \
- done
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- set x; \
- here=`pwd`; \
- if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
- include_option=--etags-include; \
- empty_fix=.; \
- else \
- include_option=--include; \
- empty_fix=; \
- fi; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- test ! -f $$subdir/TAGS || \
- set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
- fi; \
- done; \
- list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- shift; \
- if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- if test $$# -gt 0; then \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- "$$@" $$unique; \
- else \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$unique; \
- fi; \
- fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$unique
-
-GTAGS:
- here=`$(am__cd) $(top_builddir) && pwd` \
- && $(am__cd) $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) "$$here"
-
-cscope: cscope.files
- test ! -s cscope.files \
- || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS)
-
-clean-cscope:
- -rm -f cscope.files
-
-cscope.files: clean-cscope cscopelist-recursive cscopelist
-
-cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP)
- list='$(SOURCES) $(HEADERS) $(LISP)'; \
- case "$(srcdir)" in \
- [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
- *) sdir=$(subdir)/$(srcdir) ;; \
- esac; \
- for i in $$list; do \
- if test -f "$$i"; then \
- echo "$(subdir)/$$i"; \
- else \
- echo "$$sdir/$$i"; \
- fi; \
- done >> $(top_builddir)/cscope.files
-
-distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- -rm -f cscope.out cscope.in.out cscope.po.out cscope.files
-
-distdir: $(DISTFILES)
- $(am__remove_distdir)
- test -d "$(distdir)" || mkdir "$(distdir)"
- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- list='$(DISTFILES)'; \
- dist_files=`for file in $$list; do echo $$file; done | \
- sed -e "s|^$$srcdirstrip/||;t" \
- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
- case $$dist_files in \
- */*) $(MKDIR_P) `echo "$$dist_files" | \
- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
- sort -u` ;; \
- esac; \
- for file in $$dist_files; do \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test -d "$(distdir)/$$file"; then \
- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
- else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
- || exit 1; \
- fi; \
- done
- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- if test "$$subdir" = .; then :; else \
- $(am__make_dryrun) \
- || test -d "$(distdir)/$$subdir" \
- || $(MKDIR_P) "$(distdir)/$$subdir" \
- || exit 1; \
- dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
- $(am__relativize); \
- new_distdir=$$reldir; \
- dir1=$$subdir; dir2="$(top_distdir)"; \
- $(am__relativize); \
- new_top_distdir=$$reldir; \
- echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
- echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
- ($(am__cd) $$subdir && \
- $(MAKE) $(AM_MAKEFLAGS) \
- top_distdir="$$new_top_distdir" \
- distdir="$$new_distdir" \
- am__remove_distdir=: \
- am__skip_length_check=: \
- am__skip_mode_fix=: \
- distdir) \
- || exit 1; \
- fi; \
- done
- -test -n "$(am__skip_mode_fix)" \
- || find "$(distdir)" -type d ! -perm -755 \
- -exec chmod u+rwx,go+rx {} \; -o \
- ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
- ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
- ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
- || chmod -R a+r "$(distdir)"
-dist-gzip: distdir
- tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
- $(am__post_remove_distdir)
-
-dist-bzip2: distdir
- tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
- $(am__post_remove_distdir)
-
-dist-lzip: distdir
- tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
- $(am__post_remove_distdir)
-
-dist-xz: distdir
- tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
- $(am__post_remove_distdir)
-
-dist-tarZ: distdir
- tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
- $(am__post_remove_distdir)
-
-dist-shar: distdir
- shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
- $(am__post_remove_distdir)
-
-dist-zip: distdir
- -rm -f $(distdir).zip
- zip -rq $(distdir).zip $(distdir)
- $(am__post_remove_distdir)
-
-dist dist-all:
- $(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:'
- $(am__post_remove_distdir)
-
-# This target untars the dist file and tries a VPATH configuration. Then
-# it guarantees that the distribution is self-contained by making another
-# tarfile.
-distcheck: dist
- case '$(DIST_ARCHIVES)' in \
- *.tar.gz*) \
- GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
- *.tar.bz2*) \
- bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
- *.tar.lz*) \
- lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
- *.tar.xz*) \
- xz -dc $(distdir).tar.xz | $(am__untar) ;;\
- *.tar.Z*) \
- uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
- *.shar.gz*) \
- GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
- *.zip*) \
- unzip $(distdir).zip ;;\
- esac
- chmod -R a-w $(distdir)
- chmod u+w $(distdir)
- mkdir $(distdir)/_build $(distdir)/_inst
- chmod a-w $(distdir)
- test -d $(distdir)/_build || exit 0; \
- dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
- && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
- && am__cwd=`pwd` \
- && $(am__cd) $(distdir)/_build \
- && ../configure --srcdir=.. --prefix="$$dc_install_base" \
- $(AM_DISTCHECK_CONFIGURE_FLAGS) \
- $(DISTCHECK_CONFIGURE_FLAGS) \
- && $(MAKE) $(AM_MAKEFLAGS) \
- && $(MAKE) $(AM_MAKEFLAGS) dvi \
- && $(MAKE) $(AM_MAKEFLAGS) check \
- && $(MAKE) $(AM_MAKEFLAGS) install \
- && $(MAKE) $(AM_MAKEFLAGS) installcheck \
- && $(MAKE) $(AM_MAKEFLAGS) uninstall \
- && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
- distuninstallcheck \
- && chmod -R a-w "$$dc_install_base" \
- && ({ \
- (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
- && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
- && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
- && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
- distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
- } || { rm -rf "$$dc_destdir"; exit 1; }) \
- && rm -rf "$$dc_destdir" \
- && $(MAKE) $(AM_MAKEFLAGS) dist \
- && rm -rf $(DIST_ARCHIVES) \
- && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
- && cd "$$am__cwd" \
- || exit 1
- $(am__post_remove_distdir)
- @(echo "$(distdir) archives ready for distribution: "; \
- list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
- sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
-distuninstallcheck:
- @test -n '$(distuninstallcheck_dir)' || { \
- echo 'ERROR: trying to run $@ with an empty' \
- '$$(distuninstallcheck_dir)' >&2; \
- exit 1; \
- }; \
- $(am__cd) '$(distuninstallcheck_dir)' || { \
- echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \
- exit 1; \
- }; \
- test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \
- || { echo "ERROR: files left after uninstall:" ; \
- if test -n "$(DESTDIR)"; then \
- echo " (check DESTDIR support)"; \
- fi ; \
- $(distuninstallcheck_listfiles) ; \
- exit 1; } >&2
-distcleancheck: distclean
- @if test '$(srcdir)' = . ; then \
- echo "ERROR: distcleancheck can only run from a VPATH build" ; \
- exit 1 ; \
- fi
- @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
- || { echo "ERROR: files left in build directory after distclean:" ; \
- $(distcleancheck_listfiles) ; \
- exit 1; } >&2
-check-am: all-am
-check: check-recursive
-all-am: Makefile $(DATA) config.h
-installdirs: installdirs-recursive
-installdirs-am:
- for dir in "$(DESTDIR)$(pkgconfigdir)"; do \
- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- done
-install: install-recursive
-install-exec: install-exec-recursive
-install-data: install-data-recursive
-uninstall: uninstall-recursive
-
-install-am: all-am
- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-recursive
-install-strip:
- if test -z '$(STRIP)'; then \
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- install; \
- else \
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
- fi
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
- -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
- @echo "it deletes files that may require special tools to rebuild."
-clean: clean-recursive
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-recursive
- -rm -f $(am__CONFIG_DISTCLEAN_FILES)
- -rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-hdr \
- distclean-libtool distclean-tags
-
-dvi: dvi-recursive
-
-dvi-am:
-
-html: html-recursive
-
-html-am:
-
-info: info-recursive
-
-info-am:
-
-install-data-am: install-pkgconfigDATA
-
-install-dvi: install-dvi-recursive
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-recursive
-
-install-html-am:
-
-install-info: install-info-recursive
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-recursive
-
-install-pdf-am:
-
-install-ps: install-ps-recursive
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-recursive
- -rm -f $(am__CONFIG_DISTCLEAN_FILES)
- -rm -rf $(top_srcdir)/autom4te.cache
- -rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-recursive
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-recursive
-
-pdf-am:
-
-ps: ps-recursive
-
-ps-am:
-
-uninstall-am: uninstall-pkgconfigDATA
-
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \
- cscopelist-recursive ctags-recursive install-am install-strip \
- tags-recursive
-
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
- all all-am check check-am clean clean-cscope \
- clean-generic clean-libtool cscope cscopelist \
- cscopelist-recursive ctags ctags-recursive dist dist-all \
- dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ dist-xz \
- dist-zip distcheck distclean distclean-generic distclean-hdr \
- distclean-libtool distclean-tags distcleancheck distdir \
- distuninstallcheck dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-pkgconfigDATA install-ps \
- install-ps-am install-strip installcheck installcheck-am \
- installdirs installdirs-am maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-generic \
- mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
- uninstall uninstall-am uninstall-pkgconfigDATA
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
+.DEFAULT:
+ $(MAKE) -C src $@
Modified: firebird/trunk/extern/editline/src/Makefile.in
===================================================================
--- firebird/trunk/extern/editline/src/Makefile.in 2013-10-23 11:06:52 UTC (rev 58712)
+++ firebird/trunk/extern/editline/src/Makefile.in 2013-10-23 11:49:59 UTC (rev 58713)
@@ -9,96 +9,23 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
+# Alex Peshkov (pes...@ma...) 2013
+# Simplified this makefile to make it better fit firebird project needs
+
@SET_MAKE@
-
-VPATH = @srcdir@
-am__make_dryrun = \
- { \
- am__dry=no; \
- case $$MAKEFLAGS in \
- *\\[\ \ ]*) \
- echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
- | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
- *) \
- for am__flg in $$MAKEFLAGS; do \
- case $$am__flg in \
- *=*|--*) ;; \
- *n*) am__dry=yes; break;; \
- esac; \
- done;; \
- esac; \
- test $$am__dry = yes; \
- }
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
-@WIDECHAR_TRUE@am__append_1 = tokenizern.c historyn.c
-@HAVE_STRLCPY_FALSE@am__append_2 = strlcpy.c
-@HAVE_STRLCAT_FALSE@am__append_3 = strlcat.c
-@HAVE_VIS_FALSE@am__append_4 = vis.c
-@HAVE_UNVIS_FALSE@am__append_5 = unvis.c
-@WIDECHAR_TRUE@am__append_6 = eln.c
-subdir = src
-DIST_COMMON = $(nobase_include_HEADERS) \
- $(srcdir)/Makefile.in $(top_srcdir)/depcomp
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
- $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
- $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- *) f=$$p;; \
- esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
- srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
- for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
- for p in $$list; do echo "$$p $$p"; done | \
- sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
- $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
- if (++n[$$2] == $(am__install_max)) \
- { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
- END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
- sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
- sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
- test -z "$$files" \
- || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
- || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
- $(am__cd) "$$dir" && rm -f $$files; }; \
- }
-am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"
-LTLIBRARIES = $(lib_LTLIBRARIES)
-libedit_la_LIBADD =
-am__libedit_la_SOURCES_DIST = chared.c common.c el.c emacs.c hist.c \
+@WIDECHAR_TRUE@append_1 = tokenizern.c historyn.c
+@HAVE_STRLCPY_FALSE@append_2 = strlcpy.c
+@HAVE_STRLCAT_FALSE@append_3 = strlcat.c
+@HAVE_VIS_FALSE@append_4 = vis.c
+@HAVE_UNVIS_FALSE@append_5 = unvis.c
+@WIDECHAR_TRUE@append_6 = eln.c
+
+CONFIG_HEADER = ../config.h
+
+SOURCES_DIST = chared.c common.c el.c emacs.c hist.c \
keymacro.c map.c chartype.c parse.c prompt.c read.c refresh.c \
search.c sig.c terminal.c tty.c vi.c fgetln.c wcsdup.c \
tokenizer.c history.c filecomplete.c readline.c chared.h el.h \
@@ -106,553 +33,107 @@
read.h refresh.h search.h sig.h sys.h terminal.h tty.h vis.h \
filecomplete.h editline/readline.h strlcpy.c strlcat.c vis.c \
unvis.c eln.c
-@HAVE_STRLCPY_FALSE@am__objects_1 = strlcpy.lo
-@HAVE_STRLCAT_FALSE@am__objects_2 = strlcat.lo
-@HAVE_VIS_FALSE@am__objects_3 = vis.lo
-@HAVE_UNVIS_FALSE@am__objects_4 = unvis.lo
-@WIDECHAR_TRUE@am__objects_5 = eln.lo
-am_libedit_la_OBJECTS = chared.lo common.lo el.lo emacs.lo hist.lo \
- keymacro.lo map.lo chartype.lo parse.lo prompt.lo read.lo \
- refresh.lo search.lo sig.lo terminal.lo tty.lo vi.lo fgetln.lo \
- wcsdup.lo tokenizer.lo history.lo filecomplete.lo readline.lo \
- $(am__objects_1) $(am__objects_2) $(am__objects_3) \
- $(am__objects_4) $(am__objects_5)
-@WIDECHAR_TRUE@am__objects_6 = tokenizern.lo historyn.lo
-am__objects_7 = fcns.lo help.lo $(am__objects_6)
-nodist_libedit_la_OBJECTS = $(am__objects_7)
-libedit_la_OBJECTS = $(am_libedit_la_OBJECTS) \
- $(nodist_libedit_la_OBJECTS)
-AM_V_lt = $(am__v_lt_@AM_V@)
-am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
-am__v_lt_0 = --silent
-am__v_lt_1 =
-libedit_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(libedit_la_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo " GEN " $@;
-am__v_GEN_1 =
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 =
-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_@AM_V@)
-am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo " CC " $@;
-am__v_CC_1 =
-CCLD = $(CC)
-LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_@AM_V@)
-am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo " CCLD " $@;
-am__v_CCLD_1 =
-SOURCES = $(libedit_la_SOURCES) $(nodist_libedit_la_SOURCES)
-DIST_SOURCES = $(am__libedit_la_SOURCES_DIST)
-am__can_run_installinfo = \
- case $$AM_UPDATE_INFO_DIR in \
- n|no|NO) false;; \
- *) (install-info --version) >/dev/null 2>&1;; \
- esac
-HEADERS = $(nobase_include_HEADERS)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+
+@HAVE_STRLCPY_FALSE@objects_1 = strlcpy.o
+@HAVE_STRLCAT_FALSE@objects_2 = strlcat.o
+@HAVE_VIS_FALSE@objects_3 = vis.o
+@HAVE_UNVIS_FALSE@objects_4 = unvis.o
+@WIDECHAR_TRUE@objects_5 = eln.o
+OBJECTS1 = chared.o common.o el.o emacs.o hist.o \
+ keymacro.o map.o chartype.o parse.o prompt.o read.o \
+ refresh.o search.o sig.o terminal.o tty.o vi.o fgetln.o \
+ wcsdup.o tokenizer.o history.o filecomplete.o readline.o \
+ $(objects_1) $(objects_2) $(objects_3) \
+ $(objects_4) $(objects_5)
+@WIDECHAR_TRUE@objects_6 = tokenizern.o historyn.o
+objects_7 = fcns.o help.o $(objects_6)
+OBJECTS2 = $(objects_7)
+OBJECTS = $(OBJECTS1) $(OBJECTS2)
+
+DEFAULT_INCLUDES = -I. -I..
+
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(CPPFLAGS) $(CFLAGS)
+
+SOURCES =
+DIST_SOURCES = $(SOURCES_DIST)
+
+OPTFLAGS = -O2
+DEPFLAGS = -pipe -MMD -fPIC
+
AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DLLTOOL = @DLLTOOL@
-DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-FGREP = @FGREP@
-GREP = @GREP@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LIPO = @LIPO@
LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-LT_VERSION = @LT_VERSION@
-MAKEINFO = @MAKEINFO@
-MANIFEST_TOOL = @MANIFEST_TOOL@
-MANTYPE = @MANTYPE@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
-NROFF = @NROFF@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
-OTOOL = @OTOOL@
-OTOOL64 = @OTOOL64@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
RANLIB = @RANLIB@
SED = @SED@
-SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
+STATICLIB_LINK = $(AR) crus
STRIP = @STRIP@
VERSION = @VERSION@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
+
+srcdir = .
+
BUILT_SOURCES = vi.h emacs.h common.h fcns.h help.h fcns.c help.c \
- $(am__append_1)
+ $(append_1)
AHDR = vi.h emacs.h common.h
ASRC = $(srcdir)/vi.c $(srcdir)/emacs.c $(srcdir)/common.c
CLEANFILES = $(BUILT_SOURCES)
-lib_LTLIBRARIES = libedit.la
+LIBRARY = libedit.a
libedit_la_SOURCES = chared.c common.c el.c emacs.c hist.c keymacro.c \
map.c chartype.c parse.c prompt.c read.c refresh.c search.c \
sig.c terminal.c tty.c vi.c fgetln.c wcsdup.c tokenizer.c \
history.c filecomplete.c readline.c chared.h el.h hist.h \
histedit.h keymacro.h map.h chartype.h parse.h prompt.h read.h \
refresh.h search.h sig.h sys.h terminal.h tty.h vis.h \
- filecomplete.h editline/readline.h $(am__append_2) \
- $(am__append_3) $(am__append_4) $(am__append_5) \
- $(am__append_6)
-EXTRA_DIST = makelist shlib_version
+ filecomplete.h editline/readline.h $(append_2) \
+ $(append_3) $(append_4) $(append_5) \
+ $(append_6)
+
nobase_include_HEADERS = histedit.h editline/readline.h
nodist_libedit_la_SOURCES = $(BUILT_SOURCES)
-libedit_la_LDFLAGS = -no-undefined -version-info $(LT_VERSION)
+
+editlinelibrary: all
+
all: $(BUILT_SOURCES)
- $(MAKE) $(AM_MAKEFLAGS) all-am
+ $(MAKE) libedit.a
.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
+.SUFFIXES: .c .o
-$(am__aclocal_m4_deps):
-install-libLTLIBRARIES: $(lib_LTLIBRARIES)
- @$(NORMAL_INSTALL)
- @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
- list2=; for p in $$list; do \
- if test -f $$p; then \
- list2="$$list2 $$p"; \
- else :; fi; \
- done; \
- test -z "$$list2" || { \
- echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \
- $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
- }
+$(LIBRARY): $(OBJECTS)
+ -$(RM) $@
+ $(STATICLIB_LINK) $@ $^
-uninstall-libLTLIBRARIES:
- @$(NORMAL_UNINSTALL)
- @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
- for p in $$list; do \
- $(am__strip_dir) \
- echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \
- $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \
- done
-
-clean-libLTLIBRARIES:
- -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
- @list='$(lib_LTLIBRARIES)'; \
- locs=`for p in $$list; do echo $$p; done | \
- sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
- sort -u`; \
- test -z "$$locs" || { \
- echo rm -f $${locs}; \
- rm -f $${locs}; \
- }
-libedit.la: $(libedit_la_OBJECTS) $(libedit_la_DEPENDENCIES) $(EXTRA_libedit_la_DEPENDENCIES)
- $(AM_V_CCLD)$(libedit_la_LINK) -rpath $(libdir) $(libedit_la_OBJECTS) $(libedit_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
- -rm -f *.$(OBJEXT)
-
-distclean-compile:
- -rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/chared.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/chartype.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/common.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/el.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eln.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/emacs.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fcns.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fgetln.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filecomplete.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/help.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hist.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/history.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/historyn.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/keymacro.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/map.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parse.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/prompt.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/read.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/readline.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/refresh.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/search.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sig.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strlcat.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strlcpy.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/terminal.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tokenizer.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tokenizern.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tty.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unvis.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vi.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vis.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wcsdup.Plo@am__quote@
-
.c.o:
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $<
+ $(COMPILE) $(DEPFLAGS) $(OPTFLAGS) -c $< -o $@
-.c.obj:
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
+clean:
+ rm -f $(CLEANFILES) $(OBJECTS) *.d
-.c.lo:
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
+distclean: clean
+ rm -f $(LIBRARY) Makefile ../Makefile
-mostlyclean-libtool:
- -rm -f *.lo
-
-clean-libtool:
- -rm -rf .libs _libs
-install-nobase_includeHEADERS: $(nobase_include_HEADERS)
- @$(NORMAL_INSTALL)
- @list='$(nobase_include_HEADERS)'; test -n "$(includedir)" || list=; \
- if test -n "$$list"; then \
- echo " $(MKDIR_P) '$(DESTDIR)$(includedir)'"; \
- $(MKDIR_P) "$(DESTDIR)$(includedir)" || exit 1; \
- fi; \
- $(am__nobase_list) | while read dir files; do \
- xfiles=; for file in $$files; do \
- if test -f "$$file"; then xfiles="$$xfiles $$file"; \
- else xfiles="$$xfiles $(srcdir)/$$file"; fi; done; \
- test -z "$$xfiles" || { \
- test "x$$dir" = x. || { \
- echo " $(MKDIR_P) '$(DESTDIR)$(includedir)/$$dir'"; \
- $(MKDIR_P) "$(DESTDIR)$(includedir)/$$dir"; }; \
- echo " $(INSTALL_HEADER) $$xfiles '$(DESTDIR)$(includedir)/$$dir'"; \
- $(INSTALL_HEADER) $$xfiles "$(DESTDIR)$(includedir)/$$dir" || exit $$?; }; \
- done
-
-uninstall-nobase_includeHEADERS:
- @$(NORMAL_UNINSTALL)
- @list='$(nobase_include_HEADERS)'; test -n "$(includedir)" || list=; \
- $(am__nobase_strip_setup); files=`$(am__nobase_strip)`; \
- dir='$(DESTDIR)$(includedir)'; $(am__uninstall_files_from_dir)
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
-tags: TAGS
-
-TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- set x; \
- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- shift; \
- if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- if test $$# -gt 0; then \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- "$$@" $$unique; \
- else \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
- $$unique; \
- fi; \
- fi
-ctags: CTAGS
-CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$unique
-
-GTAGS:
- here=`$(am__cd) $(top_builddir) && pwd` \
- && $(am__cd) $(top_srcdir) \
- && gtags -i $(GTAGS_ARGS) "$$here"
-
-cscopelist: $(HEADERS) $(SOURCES) $(LISP)
- list='$(SOURCES) $(HEADERS) $(LISP)'; \
- case "$(srcdir)" in \
- [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
- *) sdir=$(subdir)/$(srcdir) ;; \
- esac; \
- for i in $$list; do \
- if test -f "$$i"; then \
- echo "$(subdir)/$$i"; \
- else \
- echo "$$sdir/$$i"; \
- fi; \
- done >> $(top_builddir)/cscope.files
-
-distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- list='$(DISTFILES)'; \
- dist_files=`for file in $$list; do echo $$file; done | \
- sed -e "s|^$$srcdirstrip/||;t" \
- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
- case $$dist_files in \
- */*) $(MKDIR_P) `echo "$$dist_files" | \
- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
- sort -u` ;; \
- esac; \
- for file in $$dist_files; do \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test -d "$(distdir)/$$file"; then \
- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
- else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
- || exit 1; \
- fi; \
- done
-check: $(BUILT_SOURCES)
- $(MAKE) $(AM_MAKEFLAGS) check-am
-all-am: Makefile $(LTLIBRARIES) $(HEADERS)
-installdirs:
- for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(includedir)"; do \
- test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- done
-install: $(BUILT_SOURCES)
- $(MAKE) $(AM_MAKEFLAGS) install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
- if test -z '$(STRIP)'; then \
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- install; \
- else \
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
- "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
- fi
-mostlyclean-generic:
-
-clean-generic:
- -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-
-distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
- -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
- @echo "This command is intended for maintainers to use"
- @echo "it deletes files that may require special tools to rebuild."
- -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
-clean: clean-am
-
-clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
- mostlyclean-am
-
-distclean: distclean-am
- -rm -rf ./$(DEPDIR)
- -rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
- distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-nobase_includeHEADERS
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am: install-libLTLIBRARIES
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
- -rm -rf ./$(DEPDIR)
- -rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
- mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-libLTLIBRARIES uninstall-nobase_includeHEADERS
-
-.MAKE: all check install install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+.PHONY: editlinelibrary all all-am check check-am clean clean-generic \
clean-libLTLIBRARIES clean-libtool cscopelist ctags distclean \
distclean-compile distclean-generic distclean-libtool \
distclean-tags distdir dvi dvi-am html html-am info info-am \
@@ -696,6 +177,10 @@
historyn.c: Makefile $(srcdir)/history.c
AWK=$(AWK) sh $(srcdir)/makelist -n $(srcdir)/history.c > $@
+Dependencies = $(OBJECTS:.o=.d)
+-include $(Dependencies)
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2013-10-24 00:27:53
|
Revision: 58715
http://sourceforge.net/p/firebird/code/58715
Author: firebirds
Date: 2013-10-24 00:27:50 +0000 (Thu, 24 Oct 2013)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2013-10-23 16:02:33 UTC (rev 58714)
+++ firebird/trunk/ChangeLog 2013-10-24 00:27:50 UTC (rev 58715)
@@ -1,3 +1,16 @@
+ 2013-10-23 16:02 hvlad
+ M src/iscguard/iscguard.cpp
+Fixed minor bugs
+CORE-4250 : AV in guardian at process shutdown
+CORE-4251 : Guardian service could write garbage after the end of message in the Event Log
+and clean up a bit
+
+ 2013-10-23 11:49 alexpeshkoff
+ M builds/posix/Makefile.in.extern.editline
+ M extern/editline/Makefile.in
+ M extern/editline/src/Makefile.in
+Avoid dependency from aclocal-1.12 in editline
+
2013-10-19 08:09 hvlad
M src/jrd/DatabaseSnapshot.cpp
M src/jrd/jrd.cpp
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2013-10-23 16:02:33 UTC (rev 58714)
+++ firebird/trunk/src/jrd/build_no.h 2013-10-24 00:27:50 UTC (rev 58715)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:30693
+ FORMAL BUILD NUMBER:30695
*/
-#define PRODUCT_VER_STRING "3.0.0.30693"
-#define FILE_VER_STRING "WI-T3.0.0.30693"
-#define LICENSE_VER_STRING "WI-T3.0.0.30693"
-#define FILE_VER_NUMBER 3, 0, 0, 30693
+#define PRODUCT_VER_STRING "3.0.0.30695"
+#define FILE_VER_STRING "WI-T3.0.0.30695"
+#define LICENSE_VER_STRING "WI-T3.0.0.30695"
+#define FILE_VER_NUMBER 3, 0, 0, 30695
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "30693"
+#define FB_BUILD_NO "30695"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 1"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2013-10-23 16:02:33 UTC (rev 58714)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2013-10-24 00:27:50 UTC (rev 58715)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=30693
+BuildNum=30695
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2013-10-26 00:32:05
|
Revision: 58722
http://sourceforge.net/p/firebird/code/58722
Author: firebirds
Date: 2013-10-26 00:32:01 +0000 (Sat, 26 Oct 2013)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2013-10-25 09:56:08 UTC (rev 58721)
+++ firebird/trunk/ChangeLog 2013-10-26 00:32:01 UTC (rev 58722)
@@ -1,3 +1,15 @@
+ 2013-10-25 09:56 alexpeshkoff
+ M src/auth/SecurityDatabase/LegacyServer.cpp
+cleanup
+
+ 2013-10-24 14:47 asfernandes
+ M src/jrd/recsrc/SortedStream.cpp
+Fixed CORE-4247 - Delete "where current of" cursor fails for tables with newly added fields.
+
+ 2013-10-24 13:12 alexpeshkoff
+ M src/auth/SecurityDatabase/LegacyServer.cpp
+Fixed races in legacy auth plugin
+
2013-10-23 16:02 hvlad
M src/iscguard/iscguard.cpp
Fixed minor bugs
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2013-10-25 09:56:08 UTC (rev 58721)
+++ firebird/trunk/src/jrd/build_no.h 2013-10-26 00:32:01 UTC (rev 58722)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:30695
+ FORMAL BUILD NUMBER:30698
*/
-#define PRODUCT_VER_STRING "3.0.0.30695"
-#define FILE_VER_STRING "WI-T3.0.0.30695"
-#define LICENSE_VER_STRING "WI-T3.0.0.30695"
-#define FILE_VER_NUMBER 3, 0, 0, 30695
+#define PRODUCT_VER_STRING "3.0.0.30698"
+#define FILE_VER_STRING "WI-T3.0.0.30698"
+#define LICENSE_VER_STRING "WI-T3.0.0.30698"
+#define FILE_VER_NUMBER 3, 0, 0, 30698
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "30695"
+#define FB_BUILD_NO "30698"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 1"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2013-10-25 09:56:08 UTC (rev 58721)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2013-10-26 00:32:01 UTC (rev 58722)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=30695
+BuildNum=30698
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ale...@us...> - 2013-10-28 10:27:43
|
Revision: 58728
http://sourceforge.net/p/firebird/code/58728
Author: alexpeshkoff
Date: 2013-10-28 10:27:40 +0000 (Mon, 28 Oct 2013)
Log Message:
-----------
Convert legacy auth server to non-builtin plugin on posix
Modified Paths:
--------------
firebird/trunk/builds/posix/Makefile.in
firebird/trunk/builds/posix/make.shared.variables
firebird/trunk/src/auth/SecurityDatabase/LegacyServer.cpp
firebird/trunk/src/remote/server/os/posix/inet_server.cpp
firebird/trunk/src/yvalve/MasterImplementation.cpp
firebird/trunk/src/yvalve/MasterImplementation.h
firebird/trunk/src/yvalve/PluginManager.cpp
Modified: firebird/trunk/builds/posix/Makefile.in
===================================================================
--- firebird/trunk/builds/posix/Makefile.in 2013-10-27 14:36:12 UTC (rev 58727)
+++ firebird/trunk/builds/posix/Makefile.in 2013-10-28 10:27:40 UTC (rev 58728)
@@ -411,9 +411,10 @@
# plugins - some of them are required to build examples, use separate entry for them
#
-.PHONY: udr legacy_user_management trace auth_debug
+.PHONY: udr legacy_user_management legacy_auth_server trace auth_debug
UDR_PLUGIN = $(call makePluginName,udr_engine)
LEGACY_USER_MANAGER = $(call makePluginName,Legacy_UserManager)
+LEGACY_AUTH_SERVER = $(call makePluginName,Legacy_Auth)
SRP_USER_MANAGER = $(call makePluginName,Srp)
FBTRACE = $(call makePluginName,fbtrace)
AUTH_DEBUGGER = $(call makePluginName,Auth_Debug)
@@ -423,7 +424,7 @@
BUILD_DEBUG:=auth_debug
endif
-plugins: udr legacy_user_management srp_user_management trace $(BUILD_DEBUG)
+plugins: udr legacy_user_management legacy_auth_server srp_user_management trace $(BUILD_DEBUG)
udr: $(UDR_PLUGIN) $(PLUGINS)/udr_engine.conf
@@ -438,6 +439,11 @@
$(LEGACY_USER_MANAGER): $(LEGACY_USERS_MANAGE_Objects) $(COMMON_LIB)
$(LINK_PLUGIN) $(call LIB_LINK_SONAME,$(notdir $@).0) -o $@ $^ $(LINK_PLUG_LIBS) $(FIREBIRD_LIBRARY_LINK)
+legacy_auth_server: $(LEGACY_AUTH_SERVER)
+
+$(LEGACY_AUTH_SERVER): $(LEGACY_AUTH_SERVER_Objects) $(COMMON_LIB)
+ $(LINK_PLUGIN) $(call LIB_LINK_SONAME,$(notdir $@).0) -o $@ $^ $(LINK_PLUG_LIBS) $(FIREBIRD_LIBRARY_LINK)
+
trace: $(FBTRACE)
$(FBTRACE): $(FBTRACE_UTIL_Objects) $(COMMON_LIB)
Modified: firebird/trunk/builds/posix/make.shared.variables
===================================================================
--- firebird/trunk/builds/posix/make.shared.variables 2013-10-27 14:36:12 UTC (rev 58727)
+++ firebird/trunk/builds/posix/make.shared.variables 2013-10-28 10:27:40 UTC (rev 58728)
@@ -53,9 +53,7 @@
# Remote
Remote_Common:= $(call dirObjects,remote) $(call dirObjects,auth/SecureRemotePassword)
-Remote_Server:= $(call dirObjects,remote/server) $(call dirObjects,auth/SecureRemotePassword/server) \
- $(call makeObjects,auth/SecurityDatabase,LegacyServer.cpp)
- # legacy security database LegacyServer.cpp should become plugin soon
+Remote_Server:= $(call dirObjects,remote/server) $(call dirObjects,auth/SecureRemotePassword/server)
Remote_Client:= $(call dirObjects,remote/client) $(call dirObjects,auth/SecureRemotePassword/client) \
$(call makeObjects,auth/SecurityDatabase,LegacyClient.cpp) \
$(call dirObjects,plugins/crypt/arc4)
@@ -171,6 +169,12 @@
AllObjects += $(LEGACY_USERS_MANAGE_Objects)
+# Legacy authentication on server
+LEGACY_AUTH_SERVER_Objects:= $(call makeObjects,auth/SecurityDatabase,LegacyServer.cpp)
+
+AllObjects += $(LEGACY_AUTH_SERVER_Objects)
+
+
# SRP-based users management in security database
SRP_USERS_MANAGE_Objects:= $(call dirObjects,auth/SecureRemotePassword/manage) \
$(call dirObjects,auth/SecureRemotePassword)
Modified: firebird/trunk/src/auth/SecurityDatabase/LegacyServer.cpp
===================================================================
--- firebird/trunk/src/auth/SecurityDatabase/LegacyServer.cpp 2013-10-27 14:36:12 UTC (rev 58727)
+++ firebird/trunk/src/auth/SecurityDatabase/LegacyServer.cpp 2013-10-28 10:27:40 UTC (rev 58728)
@@ -44,6 +44,10 @@
#include "../common/classes/ImplementHelper.h"
#include "firebird/Timer.h"
+#ifndef WIN_NT
+#define PLUG_MODULE 1
+#endif
+
using namespace Firebird;
namespace {
@@ -128,8 +132,18 @@
public:
int verify(IWriter* authBlock, IServerBlock* sBlock);
- static int shutdown(const int, const int, void*);
+ // This 2 are needed to satisfy temporarily different calling requirements
+ static int shutdown(const int, const int, void*)
+ {
+ return shutdown();
+ }
+ static void cleanup()
+ {
+ shutdown();
+ }
+ static int shutdown();
+
char secureDbName[MAXPATHLEN];
SecurityDatabase()
@@ -246,7 +260,9 @@
return;
}
+#ifndef PLUG_MODULE
fb_shutdown_callback(status, shutdown, fb_shut_preproviders, 0);
+#endif
lookup_db = lookup_req = 0;
@@ -417,7 +433,7 @@
}
}
-int SecurityDatabase::shutdown(const int, const int, void*)
+int SecurityDatabase::shutdown()
{
try
{
@@ -427,6 +443,7 @@
{
if (curInstances[i])
{
+ TimerInterfacePtr()->stop(curInstances[i]);
curInstances[i]->release();
curInstances[i] = NULL;
}
@@ -530,3 +547,17 @@
}
} // namespace Auth
+
+
+#ifdef PLUG_MODULE
+
+extern "C" void FB_DLL_EXPORT FB_PLUGIN_ENTRY_POINT(IMaster* master)
+{
+ CachedMasterInterface::set(master);
+
+ myModule->setCleanup(Auth::SecurityDatabase::cleanup);
+ Auth::registerLegacyServer(PluginManagerInterfacePtr());
+ myModule->registerMe();
+}
+
+#endif // PLUG_MODULE
Modified: firebird/trunk/src/remote/server/os/posix/inet_server.cpp
===================================================================
--- firebird/trunk/src/remote/server/os/posix/inet_server.cpp 2013-10-27 14:36:12 UTC (rev 58727)
+++ firebird/trunk/src/remote/server/os/posix/inet_server.cpp 2013-10-28 10:27:40 UTC (rev 58728)
@@ -385,11 +385,7 @@
{ // scope for interface ptr
Firebird::PluginManagerInterfacePtr pi;
- Auth::registerLegacyServer(pi);
Auth::registerSrpServer(pi);
-#ifdef TRUSTED_AUTH
- Auth::registerTrustedServer(pi);
-#endif
}
if (super)
Modified: firebird/trunk/src/yvalve/MasterImplementation.cpp
===================================================================
--- firebird/trunk/src/yvalve/MasterImplementation.cpp 2013-10-27 14:36:12 UTC (rev 58727)
+++ firebird/trunk/src/yvalve/MasterImplementation.cpp 2013-10-28 10:27:40 UTC (rev 58728)
@@ -457,7 +457,7 @@
return allStrings->alloc(s, len, (ThreadId) thr);
}
-} // namespace Firebird
+} // namespace Why
//
@@ -468,7 +468,12 @@
namespace {
+// Protects timerQueue array
GlobalPtr<Mutex> timerAccess;
+// Protects from races during module unload process
+// Should be taken before timerAccess
+GlobalPtr<Mutex> timerPause;
+
GlobalPtr<Semaphore> timerWakeup;
// Should use atomic flag for thread stop to provide correct membar
AtomicCounter stopTimerThread(0);
@@ -547,6 +552,7 @@
TimerDelay microSeconds = 0;
{
+ MutexLockGuard pauseGuard(timerPause, FB_FUNCTION);
MutexLockGuard guard(timerAccess, FB_FUNCTION);
const TimerDelay cur = curTime();
@@ -653,6 +659,11 @@
timerHolder.cleanup();
}
+Mutex& pauseTimer()
+{
+ return timerPause;
+}
+
} // namespace Why
Modified: firebird/trunk/src/yvalve/MasterImplementation.h
===================================================================
--- firebird/trunk/src/yvalve/MasterImplementation.h 2013-10-27 14:36:12 UTC (rev 58727)
+++ firebird/trunk/src/yvalve/MasterImplementation.h 2013-10-28 10:27:40 UTC (rev 58728)
@@ -34,6 +34,11 @@
#include "../yvalve/YObjects.h"
#include "../common/classes/ImplementHelper.h"
+namespace Firebird
+{
+ class Mutex;
+}
+
namespace Why
{
class Dtc : public Firebird::AutoIface<Firebird::IDtc, FB_DTC_VERSION>
@@ -73,6 +78,8 @@
void shutdownTimers();
void releaseUpgradeTabs(Firebird::IPluginModule* module);
+
+ Firebird::Mutex& pauseTimer();
} // namespace Why
#endif // YVALVE_MASTER_IMPLEMENTATION_H
Modified: firebird/trunk/src/yvalve/PluginManager.cpp
===================================================================
--- firebird/trunk/src/yvalve/PluginManager.cpp 2013-10-27 14:36:12 UTC (rev 58727)
+++ firebird/trunk/src/yvalve/PluginManager.cpp 2013-10-28 10:27:40 UTC (rev 58728)
@@ -353,6 +353,9 @@
if (cleanup)
{
+ // Pause timer thread for cleanup period
+ MutexLockGuard timerPause(Why::pauseTimer(), FB_FUNCTION);
+
cleanup->doClean();
Why::releaseUpgradeTabs(cleanup);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2013-10-29 00:28:32
|
Revision: 58731
http://sourceforge.net/p/firebird/code/58731
Author: firebirds
Date: 2013-10-29 00:28:28 +0000 (Tue, 29 Oct 2013)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2013-10-28 11:51:54 UTC (rev 58730)
+++ firebird/trunk/ChangeLog 2013-10-29 00:28:28 UTC (rev 58731)
@@ -1,3 +1,21 @@
+ 2013-10-28 11:51 alexpeshkoff
+ M src/remote/client/interface.cpp
+Rollback some of my wrong changes
+
+ 2013-10-28 11:50 alexpeshkoff
+ M src/yvalve/preparse.cpp
+Cleanup - we anyway do not support protocol to talk to ancient servers
+
+ 2013-10-28 10:27 alexpeshkoff
+ M builds/posix/Makefile.in
+ M builds/posix/make.shared.variables
+ M src/auth/SecurityDatabase/LegacyServer.cpp
+ M src/remote/server/os/posix/inet_server.cpp
+ M src/yvalve/MasterImplementation.cpp
+ M src/yvalve/MasterImplementation.h
+ M src/yvalve/PluginManager.cpp
+Convert legacy auth server to non-builtin plugin on posix
+
2013-10-25 09:56 alexpeshkoff
M src/auth/SecurityDatabase/LegacyServer.cpp
cleanup
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2013-10-28 11:51:54 UTC (rev 58730)
+++ firebird/trunk/src/jrd/build_no.h 2013-10-29 00:28:28 UTC (rev 58731)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:30698
+ FORMAL BUILD NUMBER:30701
*/
-#define PRODUCT_VER_STRING "3.0.0.30698"
-#define FILE_VER_STRING "WI-T3.0.0.30698"
-#define LICENSE_VER_STRING "WI-T3.0.0.30698"
-#define FILE_VER_NUMBER 3, 0, 0, 30698
+#define PRODUCT_VER_STRING "3.0.0.30701"
+#define FILE_VER_STRING "WI-T3.0.0.30701"
+#define LICENSE_VER_STRING "WI-T3.0.0.30701"
+#define FILE_VER_NUMBER 3, 0, 0, 30701
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "30698"
+#define FB_BUILD_NO "30701"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 1"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2013-10-28 11:51:54 UTC (rev 58730)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2013-10-29 00:28:28 UTC (rev 58731)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=30698
+BuildNum=30701
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hv...@us...> - 2013-10-29 08:46:36
|
Revision: 58733
http://sourceforge.net/p/firebird/code/58733
Author: hvlad
Date: 2013-10-29 08:46:32 +0000 (Tue, 29 Oct 2013)
Log Message:
-----------
Convert legacy auth server to non-builtin plugin on windows (MSVC10 build).
Modified Paths:
--------------
firebird/trunk/builds/win32/msvc10/Firebird3.sln
firebird/trunk/builds/win32/msvc10/fbserver.vcxproj
firebird/trunk/builds/win32/msvc10/fbserver.vcxproj.filters
firebird/trunk/src/auth/SecurityDatabase/LegacyServer.cpp
firebird/trunk/src/remote/server/os/win32/srvr_w32.cpp
Added Paths:
-----------
firebird/trunk/builds/win32/msvc10/legacy_auth.vcxproj
firebird/trunk/builds/win32/msvc10/legacy_auth.vcxproj.filters
Modified: firebird/trunk/builds/win32/msvc10/Firebird3.sln
===================================================================
--- firebird/trunk/builds/win32/msvc10/Firebird3.sln 2013-10-29 06:17:33 UTC (rev 58732)
+++ firebird/trunk/builds/win32/msvc10/Firebird3.sln 2013-10-29 08:46:32 UTC (rev 58733)
@@ -79,6 +79,8 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "srp", "srp.vcxproj", "{BD00D28E-6667-414E-A4B1-6BEFC07ADB42}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "legacy_auth", "legacy_auth.vcxproj", "{062BD3C7-2D01-44F6-8D79-070F688C559F}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -357,6 +359,14 @@
{BD00D28E-6667-414E-A4B1-6BEFC07ADB42}.Release|Win32.Build.0 = Release|Win32
{BD00D28E-6667-414E-A4B1-6BEFC07ADB42}.Release|x64.ActiveCfg = Release|x64
{BD00D28E-6667-414E-A4B1-6BEFC07ADB42}.Release|x64.Build.0 = Release|x64
+ {062BD3C7-2D01-44F6-8D79-070F688C559F}.Debug|Win32.ActiveCfg = Debug|Win32
+ {062BD3C7-2D01-44F6-8D79-070F688C559F}.Debug|Win32.Build.0 = Debug|Win32
+ {062BD3C7-2D01-44F6-8D79-070F688C559F}.Debug|x64.ActiveCfg = Debug|x64
+ {062BD3C7-2D01-44F6-8D79-070F688C559F}.Debug|x64.Build.0 = Debug|x64
+ {062BD3C7-2D01-44F6-8D79-070F688C559F}.Release|Win32.ActiveCfg = Release|Win32
+ {062BD3C7-2D01-44F6-8D79-070F688C559F}.Release|Win32.Build.0 = Release|Win32
+ {062BD3C7-2D01-44F6-8D79-070F688C559F}.Release|x64.ActiveCfg = Release|x64
+ {062BD3C7-2D01-44F6-8D79-070F688C559F}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Modified: firebird/trunk/builds/win32/msvc10/fbserver.vcxproj
===================================================================
--- firebird/trunk/builds/win32/msvc10/fbserver.vcxproj 2013-10-29 06:17:33 UTC (rev 58732)
+++ firebird/trunk/builds/win32/msvc10/fbserver.vcxproj 2013-10-29 08:46:32 UTC (rev 58733)
@@ -207,7 +207,6 @@
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\..\src\auth\SecureRemotePassword\server\SrpServer.cpp" />
- <ClCompile Include="..\..\..\src\auth\SecurityDatabase\LegacyServer.cpp" />
<ClCompile Include="..\..\..\src\remote\server\os\win32\chop.cpp" />
<ClCompile Include="..\..\..\src\remote\server\os\win32\cntl.cpp" />
<ClCompile Include="..\..\..\src\remote\server\os\win32\property.cpp" />
Modified: firebird/trunk/builds/win32/msvc10/fbserver.vcxproj.filters
===================================================================
--- firebird/trunk/builds/win32/msvc10/fbserver.vcxproj.filters 2013-10-29 06:17:33 UTC (rev 58732)
+++ firebird/trunk/builds/win32/msvc10/fbserver.vcxproj.filters 2013-10-29 08:46:32 UTC (rev 58733)
@@ -31,9 +31,6 @@
<ClCompile Include="..\..\..\src\remote\server\os\win32\srvr_w32.cpp">
<Filter>Remote server</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\src\auth\SecurityDatabase\LegacyServer.cpp">
- <Filter>AUTH files</Filter>
- </ClCompile>
<ClCompile Include="..\..\..\src\auth\SecureRemotePassword\server\SrpServer.cpp">
<Filter>AUTH files</Filter>
</ClCompile>
Added: firebird/trunk/builds/win32/msvc10/legacy_auth.vcxproj
===================================================================
--- firebird/trunk/builds/win32/msvc10/legacy_auth.vcxproj (rev 0)
+++ firebird/trunk/builds/win32/msvc10/legacy_auth.vcxproj 2013-10-29 08:46:32 UTC (rev 58733)
@@ -0,0 +1,187 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{062BD3C7-2D01-44F6-8D79-070F688C559F}</ProjectGuid>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <CharacterSet>MultiByte</CharacterSet>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ <Import Project="firebird2.props" />
+ <Import Project="firebird2release.props" />
+ <Import Project="DllNoEmbedManifest.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ <Import Project="firebird2.props" />
+ <Import Project="firebird2debug.props" />
+ <Import Project="DllNoEmbedManifest.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ <Import Project="firebird2.props" />
+ <Import Project="firebird2release.props" />
+ <Import Project="DllNoEmbedManifest.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ <Import Project="firebird2.props" />
+ <Import Project="firebird2debug.props" />
+ <Import Project="DllNoEmbedManifest.props" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\plugins\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\plugins\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\plugins\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\temp\$(PlatformName)\$(Configuration)\firebird\plugins\</OutDir>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>..\..\..\src\include;..\..\..\src\include\gen;..\..\..\src\common\classes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;_DEBUG;DEV_BUILD;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <Link>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <DataExecutionPrevention>
+ </DataExecutionPrevention>
+ <ModuleDefinitionFile>..\defs\plugin.def</ModuleDefinitionFile>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <ClCompile>
+ <Optimization>MaxSpeed</Optimization>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+ <AdditionalIncludeDirectories>..\..\..\src\include\gen;..\..\..\src\include;..\..\..\src\common\classes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ </ClCompile>
+ <Link>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <DataExecutionPrevention>
+ </DataExecutionPrevention>
+ <ModuleDefinitionFile>..\defs\plugin.def</ModuleDefinitionFile>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <Midl>
+ <TargetEnvironment>X64</TargetEnvironment>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>..\..\..\src\include;..\..\..\src\include\gen;..\..\..\src\common\classes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;_DEBUG;DEV_BUILD;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <Link>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <DataExecutionPrevention>
+ </DataExecutionPrevention>
+ <TargetMachine>MachineX64</TargetMachine>
+ <ModuleDefinitionFile>..\defs\plugin.def</ModuleDefinitionFile>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <Midl>
+ <TargetEnvironment>X64</TargetEnvironment>
+ </Midl>
+ <ClCompile>
+ <Optimization>MaxSpeed</Optimization>
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+ <AdditionalIncludeDirectories>..\..\..\src\include\gen;..\..\..\src\include;..\..\..\src\common\classes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ </ClCompile>
+ <Link>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <DataExecutionPrevention>
+ </DataExecutionPrevention>
+ <TargetMachine>MachineX64</TargetMachine>
+ <ModuleDefinitionFile>..\defs\plugin.def</ModuleDefinitionFile>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ResourceCompile Include="..\..\..\src\jrd\version.rc" />
+ </ItemGroup>
+ <ItemGroup>
+ <None Include="..\defs\plugin.def" />
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="common.vcxproj">
+ <Project>{15605f44-bffd-444f-ad4c-55dc9d704465}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ <ProjectReference Include="yvalve.vcxproj">
+ <Project>{4fe03933-98cd-4879-a135-fd9430087a6b}</Project>
+ </ProjectReference>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\..\src\auth\SecurityDatabase\LegacyServer.cpp" />
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file
Property changes on: firebird/trunk/builds/win32/msvc10/legacy_auth.vcxproj
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: firebird/trunk/builds/win32/msvc10/legacy_auth.vcxproj.filters
===================================================================
--- firebird/trunk/builds/win32/msvc10/legacy_auth.vcxproj.filters (rev 0)
+++ firebird/trunk/builds/win32/msvc10/legacy_auth.vcxproj.filters 2013-10-29 08:46:32 UTC (rev 58733)
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup>
+ <None Include="..\defs\plugin.def" />
+ </ItemGroup>
+ <ItemGroup>
+ <Filter Include="AUTH files">
+ <UniqueIdentifier>{7b6c8954-96af-468f-a901-f3c81597d183}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Resource files">
+ <UniqueIdentifier>{4c5e0fa9-7842-465d-9364-753bfb267c3d}</UniqueIdentifier>
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ResourceCompile Include="..\..\..\src\jrd\version.rc">
+ <Filter>Resource files</Filter>
+ </ResourceCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\..\src\auth\SecurityDatabase\LegacyServer.cpp">
+ <Filter>AUTH files</Filter>
+ </ClCompile>
+ </ItemGroup>
+</Project>
\ No newline at end of file
Property changes on: firebird/trunk/builds/win32/msvc10/legacy_auth.vcxproj.filters
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: firebird/trunk/src/auth/SecurityDatabase/LegacyServer.cpp
===================================================================
--- firebird/trunk/src/auth/SecurityDatabase/LegacyServer.cpp 2013-10-29 06:17:33 UTC (rev 58732)
+++ firebird/trunk/src/auth/SecurityDatabase/LegacyServer.cpp 2013-10-29 08:46:32 UTC (rev 58733)
@@ -44,9 +44,7 @@
#include "../common/classes/ImplementHelper.h"
#include "firebird/Timer.h"
-#ifndef WIN_NT
#define PLUG_MODULE 1
-#endif
using namespace Firebird;
Modified: firebird/trunk/src/remote/server/os/win32/srvr_w32.cpp
===================================================================
--- firebird/trunk/src/remote/server/os/win32/srvr_w32.cpp 2013-10-29 06:17:33 UTC (rev 58732)
+++ firebird/trunk/src/remote/server/os/win32/srvr_w32.cpp 2013-10-29 08:46:32 UTC (rev 58733)
@@ -266,7 +266,7 @@
{ // scope for interface ptr
PluginManagerInterfacePtr pi;
- Auth::registerLegacyServer(pi);
+ //Auth::registerLegacyServer(pi);
Auth::registerSrpServer(pi);
#ifdef TRUSTED_AUTH
Auth::registerTrustedServer(pi);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fir...@us...> - 2013-10-30 00:44:48
|
Revision: 58734
http://sourceforge.net/p/firebird/code/58734
Author: firebirds
Date: 2013-10-30 00:44:45 +0000 (Wed, 30 Oct 2013)
Log Message:
-----------
nightly update
Modified Paths:
--------------
firebird/trunk/ChangeLog
firebird/trunk/src/jrd/build_no.h
firebird/trunk/src/misc/writeBuildNum.sh
Modified: firebird/trunk/ChangeLog
===================================================================
--- firebird/trunk/ChangeLog 2013-10-29 08:46:32 UTC (rev 58733)
+++ firebird/trunk/ChangeLog 2013-10-30 00:44:45 UTC (rev 58734)
@@ -1,3 +1,17 @@
+ 2013-10-29 08:46 hvlad
+ M builds/win32/msvc10/Firebird3.sln
+ M builds/win32/msvc10/fbserver.vcxproj
+ M builds/win32/msvc10/fbserver.vcxproj.filters
+ A builds/win32/msvc10/legacy_auth.vcxproj
+ A builds/win32/msvc10/legacy_auth.vcxproj.filters
+ M src/auth/SecurityDatabase/LegacyServer.cpp
+ M src/remote/server/os/win32/srvr_w32.cpp
+Convert legacy auth server to non-builtin plugin on windows (MSVC10 build).
+
+ 2013-10-29 06:17 alexpeshkoff
+ M src/include/firebird/Timer.h
+Misc
+
2013-10-28 11:51 alexpeshkoff
M src/remote/client/interface.cpp
Rollback some of my wrong changes
Modified: firebird/trunk/src/jrd/build_no.h
===================================================================
--- firebird/trunk/src/jrd/build_no.h 2013-10-29 08:46:32 UTC (rev 58733)
+++ firebird/trunk/src/jrd/build_no.h 2013-10-30 00:44:45 UTC (rev 58734)
@@ -3,16 +3,16 @@
*** DO NOT EDIT ***
TO CHANGE ANY INFORMATION IN HERE PLEASE
EDIT src/misc/writeBuildNum.sh
- FORMAL BUILD NUMBER:30701
+ FORMAL BUILD NUMBER:30703
*/
-#define PRODUCT_VER_STRING "3.0.0.30701"
-#define FILE_VER_STRING "WI-T3.0.0.30701"
-#define LICENSE_VER_STRING "WI-T3.0.0.30701"
-#define FILE_VER_NUMBER 3, 0, 0, 30701
+#define PRODUCT_VER_STRING "3.0.0.30703"
+#define FILE_VER_STRING "WI-T3.0.0.30703"
+#define LICENSE_VER_STRING "WI-T3.0.0.30703"
+#define FILE_VER_NUMBER 3, 0, 0, 30703
#define FB_MAJOR_VER "3"
#define FB_MINOR_VER "0"
#define FB_REV_NO "0"
-#define FB_BUILD_NO "30701"
+#define FB_BUILD_NO "30703"
#define FB_BUILD_TYPE "T"
#define FB_BUILD_SUFFIX "Firebird 3.0 Alpha 1"
Modified: firebird/trunk/src/misc/writeBuildNum.sh
===================================================================
--- firebird/trunk/src/misc/writeBuildNum.sh 2013-10-29 08:46:32 UTC (rev 58733)
+++ firebird/trunk/src/misc/writeBuildNum.sh 2013-10-30 00:44:45 UTC (rev 58734)
@@ -9,7 +9,7 @@
MajorVer=3
MinorVer=0
RevNo=0
-BuildNum=30701
+BuildNum=30703
NowAt=`pwd`
cd `dirname $0`
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ale...@us...> - 2013-10-30 12:23:48
|
Revision: 58736
http://sourceforge.net/p/firebird/code/58736
Author: alexpeshkoff
Date: 2013-10-30 12:23:45 +0000 (Wed, 30 Oct 2013)
Log Message:
-----------
Cleanup - "Authentication" parameter from firebird.conf is overriden by "AuthServer"
Modified Paths:
--------------
firebird/trunk/builds/install/misc/firebird.conf.in
firebird/trunk/src/auth/SecurityDatabase/LegacyServer.cpp
firebird/trunk/src/common/config/config.cpp
firebird/trunk/src/common/config/config.h
Modified: firebird/trunk/builds/install/misc/firebird.conf.in
===================================================================
--- firebird/trunk/builds/install/misc/firebird.conf.in 2013-10-30 12:11:40 UTC (rev 58735)
+++ firebird/trunk/builds/install/misc/firebird.conf.in 2013-10-30 12:23:45 UTC (rev 58736)
@@ -188,19 +188,6 @@
# ----------------------------
-# Which authentication method(s) should be used.
-# "native" means use of only traditional interbase/firebird
-# authentication with security database.
-# "trusted" (Windows Only) makes use of window trusted authentication,
-# and in some aspects this is the most secure way to authenticate.
-# "mixed" means both methods may be used.
-#
-# Type: string
-#
-#Authentication = native
-
-
-# ----------------------------
# Trace configuration file for system audit
#
# Empty value means that system audit is turned off.
Modified: firebird/trunk/src/auth/SecurityDatabase/LegacyServer.cpp
===================================================================
--- firebird/trunk/src/auth/SecurityDatabase/LegacyServer.cpp 2013-10-30 12:11:40 UTC (rev 58735)
+++ firebird/trunk/src/auth/SecurityDatabase/LegacyServer.cpp 2013-10-30 12:23:45 UTC (rev 58736)
@@ -302,21 +302,6 @@
int SecurityDatabase::verify(IWriter* authBlock, IServerBlock* sBlock)
{
- static AmCache useNative = AM_UNKNOWN;
-
- if (useNative == AM_UNKNOWN)
- {
- // We use PathName for string comparison using platform filename comparison
- // rules (case-sensitive or case-insensitive).
- const PathName authMethod(Config::getAuthMethod());
- useNative = (authMethod == AmNative || authMethod == AmMixed) ? AM_ENABLED : AM_DISABLED;
- }
-
- if (useNative == AM_DISABLED)
- {
- return AUTH_CONTINUE;
- }
-
const char* user = sBlock->getLogin();
string login(user ? user : "");
Modified: firebird/trunk/src/common/config/config.cpp
===================================================================
--- firebird/trunk/src/common/config/config.cpp 2013-10-30 12:11:40 UTC (rev 58735)
+++ firebird/trunk/src/common/config/config.cpp 2013-10-30 12:23:45 UTC (rev 58736)
@@ -117,11 +117,7 @@
const char* GCPolicyBackground = "background";
const char* GCPolicyCombined = "combined";
-const char* AmNative = "native";
-const char* AmTrusted = "trusted";
-const char* AmMixed = "mixed";
-
const Config::ConfigEntry Config::entries[MAX_CONFIG_KEY] =
{
{TYPE_INTEGER, "TempBlockSize", (ConfigValue) 1048576}, // bytes
@@ -167,7 +163,6 @@
{TYPE_BOOLEAN, "LegacyHash", (ConfigValue) true}, // let use old passwd hash verification
{TYPE_STRING, "GCPolicy", (ConfigValue) NULL}, // garbage collection policy
{TYPE_BOOLEAN, "Redirection", (ConfigValue) false},
- {TYPE_STRING, "Authentication", (ConfigValue) AmNative}, // use native, trusted or mixed
{TYPE_INTEGER, "DatabaseGrowthIncrement", (ConfigValue) 128 * 1048576}, // bytes
{TYPE_INTEGER, "FileSystemCacheThreshold", (ConfigValue) 65536}, // page buffers
{TYPE_BOOLEAN, "RelaxedAliasChecking", (ConfigValue) false}, // if true relax strict alias checking rules in DSQL a bit
@@ -608,11 +603,6 @@
return (bool) getDefaultConfig()->values[KEY_REDIRECTION];
}
-const char *Config::getAuthMethod()
-{
- return (const char*) getDefaultConfig()->values[KEY_AUTH_METHOD];
-}
-
int Config::getDatabaseGrowthIncrement() const
{
return get<int>(KEY_DATABASE_GROWTH_INCREMENT);
Modified: firebird/trunk/src/common/config/config.h
===================================================================
--- firebird/trunk/src/common/config/config.h 2013-10-30 12:11:40 UTC (rev 58735)
+++ firebird/trunk/src/common/config/config.h 2013-10-30 12:23:45 UTC (rev 58736)
@@ -123,7 +123,6 @@
KEY_LEGACY_HASH,
KEY_GC_POLICY,
KEY_REDIRECTION,
- KEY_AUTH_METHOD,
KEY_DATABASE_GROWTH_INCREMENT,
KEY_FILESYSTEM_CACHE_THRESHOLD,
KEY_RELAXED_ALIAS_CHECKING,
@@ -312,9 +311,6 @@
// Redirection
static bool getRedirection();
- // Use native, trusted or mixed authentication
- static const char* getAuthMethod();
-
int getDatabaseGrowthIncrement() const;
int getFileSystemCacheThreshold() const;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X