[Gpa-commits] r719 - trunk/src

[scm-commit at wald.intevation.org]

Author: marcus
Date: 2005-11-08 01:51:25 +0100 (Tue, 08 Nov 2005)
New Revision: 719

Modified:
   trunk/src/ChangeLog
   trunk/src/keyserver.c
   trunk/src/server_access.c
Log:
2005-11-08  Marcus Brinkmann  <marcus at g10code.de>

	* server_access.c (write_command): New argument scheme.
	(server_send_keys): Also to invocation.
	(server_get_key): Likewise.
	(check_errors): Don't look for errors if the exit status looks OK.
	* keyserver.c (keyserver_read_list): Use HKP server as default,
	drop LDAP surfnet server (seems to be down).


Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog	2005-11-07 23:29:09 UTC (rev 718)
+++ trunk/src/ChangeLog	2005-11-08 00:51:25 UTC (rev 719)
@@ -1,5 +1,12 @@
 2005-11-08  Marcus Brinkmann  <marcus at g10code.de>
 
+	* server_access.c (write_command): New argument scheme.
+	(server_send_keys): Also to invocation.
+	(server_get_key): Likewise.
+	(check_errors): Don't look for errors if the exit status looks OK.
+	* keyserver.c (keyserver_read_list): Use HKP server as default,
+	drop LDAP surfnet server (seems to be down).
+
 	* gpgmeedit.c (edit_sign_fnc_transit): Handle early
 	"sign_uid.okay".
 

Modified: trunk/src/keyserver.c
===================================================================
--- trunk/src/keyserver.c	2005-11-07 23:29:09 UTC (rev 718)
+++ trunk/src/keyserver.c	2005-11-08 00:51:25 UTC (rev 719)
@@ -166,9 +166,8 @@
 
   if (!serverlist)
     { /* no entries in list - use default values */
-      add_server (&serverlist, "ldap://pgp.surfnet.nl:11370");
-      add_server (&serverlist, "ldap://keyserver.pgp.com");
       add_server (&serverlist, "hkp://keyserver.kjsl.com");
+      add_server (&serverlist, "ldap://keyserver.pgp.com");
     }
 
   return rc;

Modified: trunk/src/server_access.c
===================================================================
--- trunk/src/server_access.c	2005-11-07 23:29:09 UTC (rev 718)
+++ trunk/src/server_access.c	2005-11-08 00:51:25 UTC (rev 719)
@@ -1,23 +1,27 @@
-/* server_access.c - The GNU Privacy Assistant
- *      Copyright (C) 2002, Miguel Coca.
- *
- * This file is part of GPA
- *
- * GPA is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * GPA is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
+/* server_access.c - The GNU Privacy Assistant keyserver access.
+   Copyright (C) 2002 Miguel Coca.
+   Copyright (C) 2005 g10 Code GmbH.
 
+   This file is part of GPA
+
+   GPA is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   GPA is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with GPA; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA  */
+
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "gpa.h"
 #include <glib.h>
 #include <assert.h>
@@ -296,10 +300,13 @@
 }
 
 static void
-write_command (FILE *file, const char *host, const char *port, 
+write_command (FILE *file, const char *scheme,
+	       const char *host, const char *port, 
 	       const char *opaque, const char *command)
 {
-  fprintf (file, "%s\n", "VERSION 0");
+  fprintf (file, "%s\n", "VERSION 1");
+  fprintf (file, "SCHEME %s\n", scheme);
+
   if (opaque)
     {
       fprintf (file, "OPAQUE %s\n", opaque);
@@ -355,7 +362,7 @@
         }
     }
   /* If version != 0, at least try to use version 1 error codes */
-  else
+  else if (exit_status)
     {
       gint error_code = parse_helper_output (output_filename);
       /* Not really errors */
@@ -510,7 +517,7 @@
   command_fd = g_file_open_tmp (COMMAND_TEMP_NAME, &command_filename, NULL);
   command = fdopen (command_fd, "w");
   /* Write the command to the file */
-  write_command (command, host, port, opaque, "SEND");
+  write_command (command, scheme, host, port, opaque, "SEND");
   /* Write the keys to the file */
   fprintf (command, "\nKEY %s BEGIN\n", keyid);
   dump_data_to_file (data, command);
@@ -555,7 +562,7 @@
   command_fd = g_file_open_tmp (COMMAND_TEMP_NAME, &command_filename, NULL);
   command = fdopen (command_fd, "w");
   /* Write the command to the file */
-  write_command (command, host, port, opaque, "GET");
+  write_command (command, scheme, host, port, opaque, "GET");
   /* Write the keys to the file */
   fprintf (command, "0x%s\n", keyid);
   fclose (command);