security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-03-28 22:49:59 +01:00
Code Activity

(GNUPG_CHECK_GNUMAKE): Removed. Not needed for

Browse Source 
decent automakes.
This commit is contained in:
Werner Koch 2005-02-04 10:18:46 +00:00
parent 7954a24b95
commit e011ee08e2
4 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -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> 2005-02-03 David Shaw <dshaw@jabberwocky.com>
* NEWS: Fix typo. * NEWS: Fix typo.

1
configure.ac
View File

@ -1211,7 +1211,6 @@ fi
AM_CONDITIONAL(CROSS_COMPILING, test x$cross_compiling = xyes) 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 # add some extra libs here so that previous tests don't fail for
# mysterious reasons - the final link step should bail out. # mysterious reasons - the final link step should bail out.

3
util/ChangeLog
View File

@ -1,5 +1,8 @@
2005-02-03 Werner Koch <wk@g10code.com> 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. * http.c (connect_server): Define ERR outside of the !W32 block.
2005-02-01 David Shaw <dshaw@jabberwocky.com> 2005-02-01 David Shaw <dshaw@jabberwocky.com>

16
util/w32reg.c
View File

@ -1,5 +1,5 @@
/* w32reg.c - MS-Windows Registry access /* 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. * 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) if (root)
return NULL; /* no need for a RegClose, so return direct */ 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) ) if (RegOpenKeyEx (HKEY_LOCAL_MACHINE, dir, 0, KEY_READ, &key_handle) )
return NULL; /* still no need for a RegClose, so return direct */ return NULL; /* still no need for a RegClose, so return direct */
} }
nbytes = 1; nbytes = 1;
if( RegQueryValueEx( key_handle, name, 0, NULL, NULL, &nbytes ) ) if( RegQueryValueEx( key_handle, name, 0, NULL, NULL, &nbytes ) ) {
goto leave; 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) ); result = malloc( (n1=nbytes+1) );
if( !result ) if( !result )
goto leave; goto leave;