gnupg (ChangeLog configure.ac util/ChangeLog util/w32reg.c)

[cvs user wk]

    Date: Friday, February 4, 2005 @ 11:18:46
  Author: wk
    Path: /cvs/gnupg/gnupg

Modified: ChangeLog configure.ac util/ChangeLog util/w32reg.c

(GNUPG_CHECK_GNUMAKE):  Removed. Not needed for
decent automakes.


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


Index: gnupg/ChangeLog
diff -u gnupg/ChangeLog:1.239 gnupg/ChangeLog:1.240
--- gnupg/ChangeLog:1.239	Thu Feb  3 22:42:10 2005
+++ gnupg/ChangeLog	Fri Feb  4 11:18:46 2005
@@ -1,3 +1,8 @@
+2005-02-04  Werner Koch  <wk at g10code.com>
+
+	* configure.ac (GNUPG_CHECK_GNUMAKE):  Removed. Not needed for
+	decent automakes.
+
 2005-02-03  David Shaw  <dshaw at jabberwocky.com>
 
 	* NEWS: Fix typo.
Index: gnupg/configure.ac
diff -u gnupg/configure.ac:1.130 gnupg/configure.ac:1.131
--- gnupg/configure.ac:1.130	Thu Feb  3 11:21:25 2005
+++ gnupg/configure.ac	Fri Feb  4 11:18:46 2005
@@ -19,7 +19,7 @@
 dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 dnl
 dnl (Process this file with autoconf to produce a configure script.)
-dnlAC_REVISION($Revision: 1.130 $)dnl
+dnlAC_REVISION($Revision: 1.131 $)dnl
 
 AC_PREREQ(2.59)
 min_automake_version="1.9.3"
@@ -1211,7 +1211,6 @@
 
 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. 
Index: gnupg/util/ChangeLog
diff -u gnupg/util/ChangeLog:1.180 gnupg/util/ChangeLog:1.181
--- gnupg/util/ChangeLog:1.180	Thu Feb  3 12:16:27 2005
+++ gnupg/util/ChangeLog	Fri Feb  4 11:18:46 2005
@@ -1,5 +1,8 @@
 2005-02-03  Werner Koch  <wk at 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 at jabberwocky.com>
Index: gnupg/util/w32reg.c
diff -u gnupg/util/w32reg.c:1.7 gnupg/util/w32reg.c:1.8
--- gnupg/util/w32reg.c:1.7	Fri Aug 29 01:29:32 2003
+++ gnupg/util/w32reg.c	Fri Feb  4 11:18:46 2005
@@ -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 @@
       {
         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;