* engine-gpgsm.c (gpgsm_export_ext): Properly insert a space

beween patterns.

* gpgsm/t-export.c (main): Also check exporting 2 certificates.

diff --git a/trunk/gpgme/ChangeLog b/trunk/gpgme/ChangeLog
index e3eb8da76b6afd3f482b223ee5292e00796a5547..f027885d3218fc1b574a004ec60f0723ec8bbdb2 100644 (file)
--- a/trunk/gpgme/ChangeLog
+++ b/trunk/gpgme/ChangeLog
@@ -1,3 +1,12 @@
+2004-03-03  Werner Koch  <wk@gnupg.org>
+
+       * engine-gpgsm.c (gpgsm_export_ext): Properly insert a space
+       beween patterns.
+
+2004-02-18  Werner Koch  <wk@gnupg.org>
+
+       * gpgme-config.in: Ignore setting of --prefix.
+
 2004-02-25  Marcus Brinkmann  <marcus@g10code.de>
 
        * rungpg.c (gpg_cancel): New function.

diff --git a/trunk/gpgme/engine-gpgsm.c b/trunk/gpgme/engine-gpgsm.c
index f2e51514dcc5152e887a780bbe0fc0c65cf1f08b..11011318d97c941b9eb49fe0edcacbe7bc542456 100644 (file)
--- a/trunk/gpgme/engine-gpgsm.c
+++ b/trunk/gpgme/engine-gpgsm.c
@@ -1106,7 +1106,6 @@ gpgsm_export_ext (void *engine, const char *pattern[], unsigned int reserved,
              patlet++;
            }
          pat++;
-         /* This will allocate one byte more than necessary.  */
          length++;
        }
     }
@@ -1149,6 +1148,8 @@ gpgsm_export_ext (void *engine, const char *pattern[], unsigned int reserved,
              patlet++;
            }
          pattern++;
+          if (*pattern)
+            *linep++ = ' ';
        }
     }
   *linep = '\0';

diff --git a/trunk/gpgme/gpgme-config.in b/trunk/gpgme/gpgme-config.in
index b21013e9b2d73b1ab04d8c9ef510007a88678958..270f965ce80db9b964c71ec10ed36b736b327d60 100644 (file)
--- a/trunk/gpgme/gpgme-config.in
+++ b/trunk/gpgme/gpgme-config.in
@@ -61,9 +61,15 @@ while test $# -gt 0; do
     esac
 
     case $1 in
+        --prefix=*)
+            # For compatibility reasons with old M4 macros, we ignore
+            # setting of prefix.
+            ;;
         --prefix)
            output="$output $prefix"
            ;;
+        --exec-prefix=*)
+            ;;
         --exec-prefix)
            output="$output $exec_prefix"
            ;;

diff --git a/trunk/tests/ChangeLog b/trunk/tests/ChangeLog
index e80cf7b63f081b57d3169c23a044369faec4ec17..ff9a9c7021e6cefb447be74ff1992b2484d1cd23 100644 (file)
--- a/trunk/tests/ChangeLog
+++ b/trunk/tests/ChangeLog
@@ -1,3 +1,7 @@
+2004-03-03  Werner Koch  <wk@gnupg.org>
+
+       * gpgsm/t-export.c (main): Also check exporting 2 certificates.
+
 2004-02-17  Werner Koch  <wk@gnupg.org>
 
        * gpgsm/t-import.c (check_result): gpgsm does now return info in

diff --git a/trunk/tests/gpgsm/t-export.c b/trunk/tests/gpgsm/t-export.c
index f876de706fc3505c37e3fef6598a54b0dea66eb0..9139f8c6b09e1155ac0233f7b671f72063dd9b14 100644 (file)
--- a/trunk/tests/gpgsm/t-export.c
+++ b/trunk/tests/gpgsm/t-export.c
@@ -39,7 +39,10 @@ main (int argc, char *argv[])
   gpgme_ctx_t ctx;
   gpgme_error_t err;
   gpgme_data_t out;
-  const char *pattern[] = { "DFN Top Level Certification Authority", NULL };
+  const char *pattern1[] = { "DFN Top Level Certification Authority", NULL };
+  const char *pattern2[] = { "3CF405464F66ED4A7DF45BBDD1E4282E33BDB76E",
+                             "DFN Server Certification Authority", 
+                             NULL };
 
   init_gpgme (GPGME_PROTOCOL_CMS);
 
@@ -47,11 +50,25 @@ main (int argc, char *argv[])
   fail_if_err (err);
   gpgme_set_protocol (ctx, GPGME_PROTOCOL_CMS);
 
+  gpgme_set_armor (ctx, 1);
+
+  /* Check exporting of one certificate. */
   err = gpgme_data_new (&out);
   fail_if_err (err);
+  err = gpgme_op_export_ext (ctx, pattern1, 0, out);
+  fail_if_err (err);
 
-  gpgme_set_armor (ctx, 1);
-  err = gpgme_op_export_ext (ctx, pattern, 0, out);
+  fflush (NULL);
+  fputs ("Begin Result:\n", stdout);
+  print_data (out);
+  fputs ("End Result.\n", stdout);
+
+  gpgme_data_release (out);
+
+  /* Check exporting of 2 certificates. */
+  err = gpgme_data_new (&out);
+  fail_if_err (err);
+  err = gpgme_op_export_ext (ctx, pattern2, 0, out);
   fail_if_err (err);
 
   fflush (NULL);
@@ -60,6 +77,8 @@ main (int argc, char *argv[])
   fputs ("End Result.\n", stdout);
 
   gpgme_data_release (out);
+
+
   gpgme_release (ctx);
 
   return 0;