[git] GnuPG - branch, STABLE-BRANCH-1-4, updated. gnupg-1.4.12-14-gc3a5448

[by Werner Koch]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".

The branch, STABLE-BRANCH-1-4 has been updated
       via  c3a5448379cdf07b408a265fe8f477901524170d (commit)
      from  b1abc01d4ad199258b3d2fb579ac06c6fea747fd (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit c3a5448379cdf07b408a265fe8f477901524170d
Author: Werner Koch <wk at gnupg.org>
Date:   Wed Nov 7 21:38:27 2012 +0100

    Fix usage of dlerror to conform to POSIX.
    
    * cipher/idea-stub.c: Clear last error before dlsym.
    --
    
    This is required for NetBSD.
    
    Reported-by: Thomas Klausner

diff --git a/cipher/idea-stub.c b/cipher/idea-stub.c
index 8996c75..abfb929 100644
--- a/cipher/idea-stub.c
+++ b/cipher/idea-stub.c
@@ -25,9 +25,9 @@
    problem with this, please see http://www.noepatents.org.
 
    However for research purposes and in certain situations it might be
-   useful to use this algorithm anyway.  
+   useful to use this algorithm anyway.
 
-   We provide this stub which will dynload a idea module and is only 
+   We provide this stub which will dynload a idea module and is only
    used if the configure run did't found statically linked file.
    See http://www.gnupg.org/why-not-dea.html for details.
 */
@@ -55,12 +55,12 @@
 #define USE_DYNAMIC_LINKING 1
 
 static int last_error = 0;
-    
+
 void*
 dlopen (const char *pathname, int mode)
 {
   void *h = LoadLibrary (pathname);
-  if (!h) 
+  if (!h)
     {
       log_error ("LoadLibrary failed: %s\n", w32_strerror (errno));
       last_error = 1;
@@ -130,14 +130,16 @@ load_module (const char *name)
       goto failure;
     }
 
+  dlerror ();  /* Clear old errors or initialize dlerror.  */
+
   sym = dlsym (handle, "idea_get_info");
   if (dlerror ())
     sym = dlsym (handle, "_idea_get_info");
-  if ((err=dlerror())) 
+  if ((err=dlerror()))
     goto failure;
 
   return (INFO_FNC)sym;
-  
+
  failure:
   log_info ("invalid module `%s': %s\n", name?name:"???", err?err:"???");
   if (handle)

-----------------------------------------------------------------------

Summary of changes:
 cipher/idea-stub.c |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org