* import.c (import_one): When merging with a key we already have, don't

let a key conflict (same keyid but different key) stop the import: just
skip the bad key and continue.

* exec.c (make_tempdir): Under Win32, don't try environment variables for
temp directories - GetTempDir tries environment variables internally, and
it's better not to second-guess it in case MS adds some sort of temp dir
handling to Windows at some point.

g10/import.c

@@ -517,13 +517,11 @@ import_one( const char *fname, KBNODE keyblock, int fast,
         KEYDB_HANDLE hd;
 	int n_uids, n_sigs, n_subk;
 
-
 	/* Compare the original against the new key; just to be sure nothing
 	 * weird is going on */
 	if( cmp_public_keys( pk_orig, pk ) ) {
 	    log_error( _("key %08lX: doesn't match our copy\n"),
 							  (ulong)keyid[1]);
-	    rc = G10ERR_GENERAL;
 	    goto leave;
 	}