From e011ee08e285adfc2b0d319482a76086b96fa5d5 Mon Sep 17 00:00:00 2001
From: Werner Koch <wk@gnupg.org>
Date: Fri, 4 Feb 2005 10:18:46 +0000
Subject: [PATCH] (GNUPG_CHECK_GNUMAKE):  Removed. Not needed for decent
 automakes.

---
 ChangeLog      |  5 +++++
 configure.ac   |  1 -
 util/ChangeLog |  3 +++
 util/w32reg.c  | 16 ++++++++++++----
 4 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 847389785..36ec6037a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-02-04  Werner Koch  <wk@g10code.com>
+
+	* configure.ac (GNUPG_CHECK_GNUMAKE):  Removed. Not needed for
+	decent automakes.
+
 2005-02-03  David Shaw  <dshaw@jabberwocky.com>
 
 	* NEWS: Fix typo.
diff --git a/configure.ac b/configure.ac
index 0ebc33c7b..12da089c8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1211,7 +1211,6 @@ fi
 
 AM_CONDITIONAL(CROSS_COMPILING, test x$cross_compiling = xyes)
 
-GNUPG_CHECK_GNUMAKE
 
 # add some extra libs here so that previous tests don't fail for
 # mysterious reasons - the final link step should bail out. 
diff --git a/util/ChangeLog b/util/ChangeLog
index 4cb53c792..a782ee9c5 100644
--- a/util/ChangeLog
+++ b/util/ChangeLog
@@ -1,5 +1,8 @@
 2005-02-03  Werner Koch  <wk@g10code.com>
 
+	* w32reg.c (read_w32_registry_string): Fallback to HKLM also for a
+	missing name.
+
 	* http.c (connect_server): Define ERR outside of the !W32 block.
 
 2005-02-01  David Shaw  <dshaw@jabberwocky.com>
diff --git a/util/w32reg.c b/util/w32reg.c
index edc77ced9..f8e81b478 100644
--- a/util/w32reg.c
+++ b/util/w32reg.c
@@ -1,5 +1,5 @@
 /* w32reg.c -  MS-Windows Registry access
- *	Copyright (C) 1999, 2002 Free Software Foundation, Inc.
+ *	Copyright (C) 1999, 2002, 2005 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -77,14 +77,22 @@ read_w32_registry_string( const char *root, const char *dir, const char *name )
       {
         if (root)
           return NULL; /* no need for a RegClose, so return direct */
-        /* It seems to be common practise to fall back to HLM. */
+        /* It seems to be common practise to fall back to HKLM. */
         if (RegOpenKeyEx (HKEY_LOCAL_MACHINE, dir, 0, KEY_READ, &key_handle) )
           return NULL; /* still no need for a RegClose, so return direct */
       }
 
     nbytes = 1;
-    if( RegQueryValueEx( key_handle, name, 0, NULL, NULL, &nbytes ) )
-	goto leave;
+    if( RegQueryValueEx( key_handle, name, 0, NULL, NULL, &nbytes ) ) {
+        if (root)
+            goto leave;
+        /* Try to fallback to HKLM also vor a missing value.  */
+        RegCloseKey (key_handle);
+        if (RegOpenKeyEx (HKEY_LOCAL_MACHINE, dir, 0, KEY_READ, &key_handle) )
+            return NULL; /* Nope.  */
+        if (RegQueryValueEx( key_handle, name, 0, NULL, NULL, &nbytes))
+            goto leave;
+    }
     result = malloc( (n1=nbytes+1) );
     if( !result )
 	goto leave;