--- trunk/Src/wptKeyserver.cpp	2006/05/27 08:56:00	219
+++ trunk/Src/wptKeyserver.cpp	2006/05/30 15:31:49	220
@@ -146,6 +146,7 @@
     char *p, *end;
     int ec, len;
 
+    log_debug ("check_hkp_response: '%s'\r\n", resp);
     ec = recv ? WPTERR_WINSOCK_RECVKEY : WPTERR_WINSOCK_SENDKEY;
     if (!strstr (resp, "HTTP/1.0 200 OK") &&
 	!strstr (resp, "HTTP/1.1 200 OK")) /* http error */
@@ -452,6 +453,7 @@
 	closesocket (fd);
 	return 0;
     }
+    log_debug ("kserver_check_inet_connection: no inet connection.\r\n");
     return -1;
 }
 
@@ -535,18 +537,22 @@
 }
 
 
+/* Set the default keyserver. 
+   If @hostname is NULL, use the predefined keyserver. */
 void
 keyserver_set_default (const char *hostname, WORD port)
 {
+    if (!port)
+	port = HKP_PORT;
     if (hostname != NULL) {
 	free_if_alloc (default_keyserver);
 	default_keyserver = m_strdup (hostname);
 	default_keyserver_port = port;
     }
-    if (!port)
-	port = HKP_PORT;
-    if (!default_keyserver)
+    if (!default_keyserver) {
 	default_keyserver = m_strdup (DEF_HKP_KEYSERVER);
+	default_keyserver_port = HKP_PORT;
+    }
     server[0].name =  m_strdup (default_keyserver);
     server[0].used = 1;
     server[0].port = port;
@@ -854,7 +860,7 @@
     }
 
     free_if_alloc (enc_pubkey);
-    log_debug ("%s\r\n", request);
+    log_debug ("request:\r\n%s\r\n", request);
     return request;
 }
 
@@ -899,7 +905,7 @@
         _snprintf (request, reqlen, fmt, keyid);
     }
 
-    log_debug ("%s\r\n", request);
+    log_debug ("request:\r\n%s\r\n", request);
     
     rc = sock_write (conn_fd, request, strlen (request));
     if (rc == SOCKET_ERROR) {
@@ -913,7 +919,7 @@
         goto leave;
     }
 
-    log_debug ("%s\r\n", *r_key);
+    log_debug ("response:\r\n%s\r\n", *r_key);
     rc = check_hkp_response (*r_key, 1);
     if (rc)
         goto leave;
@@ -1173,8 +1179,7 @@
 	    break;
 
 	case UID:
-	    /* XXX: search for %3A and decode it back to ':' */
-	    u->uid = m_strdup (p);
+	    unhexify_buffer (p, &u->uid);
 	    break;
 
 	case CREATE:
@@ -1232,6 +1237,7 @@
     for (;;) {
 	if (sock_getline (fd, buf, sizeof (buf)-1, &n))
 	    break;
+	/*log_debug ("record: '%s'\r\n", buf); */
 	if (!strncmp (buf, "pub", 3))
 	    parse_pub_record (key, buf);
 	else
@@ -1504,6 +1510,6 @@
     /* XXX: remove / in .de/:11371 */
     *r_keyserver = substr (url, 0, (p-url));    
     *r_port = atoi (url+(p-url)+1);
-    safe_free (url);
+    free_if_alloc (url);
     return 0;
 }