Changed the way i18n files are located under Windows. The setting of the

Registry key is not anymore required.  Helpfiles are not properly located.

2 files changed, 7 insertions, 2 deletions

diff --git a/g10/ChangeLog b/g10/ChangeLog
index c9ad8f95f..fbb2930f8 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,8 @@
+2008-03-25  Werner Koch  <[email protected]>
+
+	* keyserver.c (parse_keyrec): Take care of char defaulting to
+	unsigned when using hextobyte.
+
 2008-03-25  David Shaw  <[email protected]>  (wk)
 
 	* import.c (collapse_uids): Fix bug 894: possible memory
diff --git a/g10/keyserver.c b/g10/keyserver.c
index 23497d819..9a4e08483 100644
--- a/g10/keyserver.c
+++ b/g10/keyserver.c
@@ -683,9 +683,9 @@ parse_keyrec(char *keystring)
       while(*tok)
 	if(tok[0]=='%' && tok[1] && tok[2])
 	  {
-	    if((userid[i]=hextobyte(&tok[1]))==-1)
-	      userid[i]='?';
+            int c;
 
+	    userid[i] = (c=hextobyte(&tok[1])) == -1 ? '?' : c;
 	    i++;
 	    tok+=3;
 	  }