more fixes due to automake 1.5SNAP-1-0-6b

5 files changed, 42 insertions, 7 deletions

diff --git a/g10/ChangeLog b/g10/ChangeLog
index 6d5bbe318..06588eebc 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,5 +1,15 @@
+2001-10-23  Werner Koch  <[email protected]>
+
+	* keyedit.c (keyedit_menu): Changed helptext for showpref
+	command.  Suggested by Reinhard Wobst.
+
+	* keyring.c (keyring_search): When marking the offtbl ready, take
+	into account that we may have more than one keyring.
+
 2001-10-22  Werner Koch  <[email protected]>
 
+	* Makefile.am: Do not use OMIT_DEPENDENCIES
+
 	* build-packet.c (build_sig_subpkt): Default is now to put all
 	types of subpackets into the hashed area and only list those which
 	should go into the unhashed area.
diff --git a/g10/Makefile.am b/g10/Makefile.am
index 7ad0afdc6..9828da796 100644
--- a/g10/Makefile.am
+++ b/g10/Makefile.am
@@ -20,7 +20,8 @@
 
 INCLUDES = -I.. -I$(top_srcdir)/include -I$(top_srcdir)/intl
 EXTRA_DIST = OPTIONS  pubring.asc  options.skel
-OMIT_DEPENDENCIES = zlib.h zconf.h
+# it seems that we can't use this with automake 1.5
+#OMIT_DEPENDENCIES = zlib.h zconf.h
 LDFLAGS = @LDFLAGS@ @DYNLINK_LDFLAGS@
 needed_libs = ../cipher/libcipher.a ../mpi/libmpi.a ../util/libutil.a
 
diff --git a/g10/keyedit.c b/g10/keyedit.c
index ed4c0c279..980ee0927 100644
--- a/g10/keyedit.c
+++ b/g10/keyedit.c
@@ -597,8 +597,8 @@ keyedit_menu( const char *username, STRLIST locusr, STRLIST commands,
 	{ N_("toggle")  , cmdTOGGLE    , 1,0,0, N_("toggle between secret "
 						   "and public key listing") },
 	{ N_("t"     )  , cmdTOGGLE    , 1,0,0, NULL },
-	{ N_("pref")    , cmdPREF      , 0,1,0, N_("list preferences") },
-	{ N_("showpref"), cmdSHOWPREF  , 0,1,0, N_("list preferences") },
+	{ N_("pref")    , cmdPREF      , 0,1,0, N_("list preferences (expert)") },
+	{ N_("showpref"), cmdSHOWPREF  , 0,1,0, N_("list preferences (verbose)") },
 	{ N_("setpref") , cmdSETPREF   , 1,1,0, N_("set preference list") },
 	{ N_("updpref") , cmdUPDPREF   , 1,1,0, N_("updated preferences") },
 	{ N_("passwd")  , cmdPASSWD    , 1,1,0, N_("change the passphrase") },
diff --git a/g10/keyring.c b/g10/keyring.c
index 95f92b171..153647572 100644
--- a/g10/keyring.c
+++ b/g10/keyring.c
@@ -55,6 +55,7 @@ struct keyring_name {
   int secret;
   DOTLOCK lockhd;
   int is_locked;
+  int did_full_scan;
   char fname[1];
 };
 typedef struct keyring_name const * CONST_KR_NAME;
@@ -214,6 +215,7 @@ keyring_register_filename (const char *fname, int secret)
     kr->secret = !!secret;
     kr->lockhd = NULL;
     kr->is_locked = 0;
+    kr->did_full_scan = 0;
     /* keep a list of all issued pointers */
     kr->next = kr_names;
     kr_names = kr;
@@ -1074,10 +1076,32 @@ keyring_search (KEYRING_HANDLE hd, KEYDB_SEARCH_DESC *desc, size_t ndesc)
   else if (rc == -1)
     {
       hd->current.eof = 1;
-      /* if we scanned the entire keyring, we are sure that
+      /* if we scanned all keyrings, we are sure that
        * all known key IDs are in our offtbl, mark that. */
-      if (use_offtbl)
-        kr_offtbl_ready = 1;
+      if (use_offtbl && !kr_offtbl_ready)
+        {
+          KR_NAME kr;
+          
+          /* First set the did_full_scan flag for this keyring (ignore
+             secret keyrings) */
+          for (kr=kr_names; kr; kr = kr->next)
+            {
+              if (!kr->secret && hd->resource == kr) 
+                {
+                  kr->did_full_scan = 1;
+                  break;
+                }
+            }
+          /* Then check whether all flags are set and if so, mark the
+             offtbl ready */
+          for (kr=kr_names; kr; kr = kr->next)
+            {
+              if (!kr->secret && !kr->did_full_scan) 
+                break;
+            }
+          if (!kr)
+            kr_offtbl_ready = 1;
+        }
     }
   else 
     hd->current.error = rc;
diff --git a/g10/pkclist.c b/g10/pkclist.c
index 52310282c..9a4e4dd0f 100644
--- a/g10/pkclist.c
+++ b/g10/pkclist.c
@@ -151,7 +151,7 @@ show_revocation_reason( PKT_public_key *pk )
 static void
 show_paths (const PKT_public_key *pk, int only_first )
 {
-#warning must change enum_cert_paths to use pk
+    log_debug("not yet implemented\n");
 #if 0    
     void *context = NULL;
     unsigned otrust, validity;