[Gpa-commits] r862 - trunk/src

[scm-commit@wald.intevation.org]

Author: werner
Date: 2008-03-26 16:53:16 +0100 (Wed, 26 Mar 2008)
New Revision: 862

Modified:
   trunk/src/ChangeLog
   trunk/src/gpa.c
   trunk/src/keyserver.c
Log:
Chnage default keyservers.
Change option name --server to --daemon.


Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog	2008-03-21 15:26:34 UTC (rev 861)
+++ trunk/src/ChangeLog	2008-03-26 15:53:16 UTC (rev 862)
@@ -1,3 +1,12 @@
+2008-03-26  Werner Koch  <wk at g10code.com>
+
+	* gpa.c: Change option --server to --daemon.
+
+2008-03-25  Werner Koch  <wk at g10code.com>
+
+	* keyserver.c (keyserver_read_list): Replace subkeys.pgp.net by
+	keys.gnupg.net.
+
 2008-03-19  Marcus Brinkmann  <marcus at g10code.de>
 
 	* fileman.c (get_load_file_name): Set default response.

Modified: trunk/src/gpa.c
===================================================================
--- trunk/src/gpa.c	2008-03-21 15:26:34 UTC (rev 861)
+++ trunk/src/gpa.c	2008-03-26 15:53:16 UTC (rev 862)
@@ -96,7 +96,7 @@
       N_("Open file manager"), NULL },
     { "clipboard", 'c', 0, G_OPTION_ARG_NONE, &args.start_clipboard,
       N_("Open clipboard"), NULL },
-    { "server", 's', 0, G_OPTION_ARG_NONE, &args.start_only_server,
+    { "daemon", 'd', 0, G_OPTION_ARG_NONE, &args.start_only_server,
       N_("Start only the UI server (implies --cms)"), NULL },
     { "options", 'o', 0, G_OPTION_ARG_FILENAME, &args.options_filename,
       N_("Read options from file"), "FILE" },

Modified: trunk/src/keyserver.c
===================================================================
--- trunk/src/keyserver.c	2008-03-21 15:26:34 UTC (rev 861)
+++ trunk/src/keyserver.c	2008-03-26 15:53:16 UTC (rev 862)
@@ -174,19 +174,16 @@
 
   if (!serverlist)
     { /* no entries in list - use default values */
-      add_server (&serverlist, "hkp://random.sks.keyserver.penguin.de");
+      add_server (&serverlist, "hkp://keys.gnupg.net");
       add_server (&serverlist, "hkp://blackhole.pca.dfn.de"); 
+      add_server (&serverlist, "hkp://minsky.surfnet.nl"); 
       add_server (&serverlist, "hkp://pks.gpg.cz");
       add_server (&serverlist, "hkp://pgp.cns.ualberta.ca");
-      add_server (&serverlist, "hkp://minsky.surfnet.nl");
       add_server (&serverlist, "hkp://keyserver.ubuntu.com");
       add_server (&serverlist, "hkp://keyserver.pramberger.at");
 
       add_server (&serverlist, "http://gpg-keyserver.de");
       add_server (&serverlist, "http://keyserver.pramberger.at");
-   
-      add_server (&serverlist, "hkp://subkeys.pgp.net"); 
-      add_server (&serverlist, "ldap://keyserver.pgp.com");
     }
 
   return rc;