summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>1999-02-13 14:17:29 +0100
committerWerner Koch <wk@gnupg.org>1999-02-13 14:17:29 +0100
commit6e5bc13878a31f06345e72bea11d42a003c480d0 (patch)
tree9c8dfddb401de32b70b0012447d29d5322d71d25
parentSee ChangeLog: Sat Feb 13 12:14:42 CET 1999 Werner Koch (diff)
downloadgnupg2-6e5bc13878a31f06345e72bea11d42a003c480d0.tar.xz
gnupg2-6e5bc13878a31f06345e72bea11d42a003c480d0.zip
See ChangeLog: Sat Feb 13 14:13:04 CET 1999 Werner Koch
-rw-r--r--INSTALL4
-rw-r--r--checks/Makefile.am8
-rw-r--r--configure.in2
-rw-r--r--g10/ChangeLog4
-rw-r--r--g10/tdbio.c5
5 files changed, 14 insertions, 9 deletions
diff --git a/INSTALL b/INSTALL
index e91622adf..c6bd647c2 100644
--- a/INSTALL
+++ b/INSTALL
@@ -21,9 +21,7 @@ Configure options for GNUPG
option "--debug 128" displays a memory statistic after
the program run.
---disable-m-guard Disable the integrated malloc checking code. As a
- side-effect, this removes all debugging code and uses
- the -O2 flag for all C files.
+--enable-m-guard Enable the integrated malloc checking code.
--disable-dynload If you have problems with dynamic loading, this option
disables all dynamic loading stuff.
diff --git a/checks/Makefile.am b/checks/Makefile.am
index 8fb3d7d36..af588a358 100644
--- a/checks/Makefile.am
+++ b/checks/Makefile.am
@@ -20,14 +20,12 @@ DATA_FILES = data-500 data-9000 data-32000 data-80000
EXTRA_DIST = defs.inc run-gpg run-gpgm run-gpg.patterns $(TESTS) $(TEST_FILES)
CLEANFILES = prepared.stamp x y yy z out err $(DATA_FILES) \
- plain-1 plain-2 plain-3 options trustdb.gpg *.lock .\#lk*
-DISTCLEANFILES = pubring.gpg secring.gpg pubring.pkr secring.skr
+ plain-1 plain-2 plain-3 options trustdb.gpg *.lock .\#lk* \
+ pubring.gpg secring.gpg pubring.pkr secring.skr
-check: prepared.stamp
-
-testdata: prepared.stamp
+all-local: prepared.stamp
prepared.stamp: ./pubring.gpg ./secring.gpg ./plain-1 ./plain-2 ./plain-3 \
./pubring.pkr ./secring.skr $(DATA_FILES)
diff --git a/configure.in b/configure.in
index 0bd463e59..e16954361 100644
--- a/configure.in
+++ b/configure.in
@@ -92,7 +92,7 @@ MPI_OPT_FLAGS=""
if test "$GCC" = yes; then
CFLAGS="$CFLAGS -Wall"
dnl Always enable optimazation in MPI
- if echo "$CFLAGS" | grep "-O" >/dev/null ; then
+ if echo "$CFLAGS" | grep "[-]O" >/dev/null ; then
:
else
MPI_OPT_FLAGS=-O2
diff --git a/g10/ChangeLog b/g10/ChangeLog
index 61551dc5d..996c6cf1a 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,7 @@
+Sat Feb 13 14:13:04 CET 1999 Werner Koch <wk@isil.d.shuttle.de>
+
+ * tdbio.c (tdbio_set_dbname): Init lockhandle for a new trustdb
+
Wed Feb 10 17:15:39 CET 1999 Werner Koch <wk@isil.d.shuttle.de>
* g10.c (main): check for development version now in configure
diff --git a/g10/tdbio.c b/g10/tdbio.c
index 2eddb4b2d..6aaa18012 100644
--- a/g10/tdbio.c
+++ b/g10/tdbio.c
@@ -466,6 +466,11 @@ tdbio_set_dbname( const char *new_dbname, int create )
if( db_fd == -1 )
log_fatal( _("%s: can't open: %s\n"), db_name, strerror(errno) );
+ if( !lockhandle )
+ lockhandle = create_dotlock( db_name );
+ if( !lockhandle )
+ log_fatal( _("%s: can't create lock\n"), db_name );
+
memset( &rec, 0, sizeof rec );
rec.r.ver.version = 2;
rec.r.ver.created = make_timestamp();