GNOME.org
 

[gnome-keyring] Remove old keyring socket, library and code support.

commit da22a40250da283a502ecb35add5e6548c654c6b
Author: Stef Walter <stef memberwebs com>
Date:   Thu Dec 17 03:57:11 2009 +0000

    Remove old keyring socket, library and code support.
    
    After this commit, all callers must use the libgnome-keyring module
    to access secrets. The old socket method and included library
    no longer work.

 HACKING                                            |   13 -
 Makefile.am                                        |    2 -
 TODO                                               |   18 -
 configure.in                                       |    9 +-
 daemon/Makefile.am                                 |    7 +-
 daemon/control/Makefile.am                         |    3 +-
 daemon/control/gkd-control-client.c                |    2 +-
 .../{gkd-control-private.h => gkd-control-codes.h} |    0
 daemon/control/gkd-control-server.c                |    2 +-
 daemon/control/tests/test-control-change           |  Bin 96222 -> 96222 bytes
 daemon/control/tests/test-control-unlock           |  Bin 96149 -> 96149 bytes
 daemon/dbus/gkd-dbus-service.c                     |   19 +-
 daemon/gkd-main.c                                  |    9 -
 daemon/gkd-util.c                                  |    1 -
 daemon/gkr-daemon-io.c                             |  441 --
 daemon/gkr-daemon-ops.c                            | 1779 --------
 daemon/gkr-daemon.h                                |   52 -
 daemon/keyrings/.gitignore                         |    6 -
 daemon/keyrings/Makefile.am                        |   36 -
 daemon/keyrings/gkr-keyring-binary.c               |  676 ---
 daemon/keyrings/gkr-keyring-item.c                 |  412 --
 daemon/keyrings/gkr-keyring-item.h                 |  111 -
 daemon/keyrings/gkr-keyring-login.c                |  325 --
 daemon/keyrings/gkr-keyring-login.h                |   50 -
 daemon/keyrings/gkr-keyring-textual.c              |  453 --
 daemon/keyrings/gkr-keyring.c                      |  624 ---
 daemon/keyrings/gkr-keyring.h                      |  145 -
 daemon/keyrings/gkr-keyrings.c                     |  406 --
 daemon/keyrings/gkr-keyrings.h                     |   53 -
 daemon/keyrings/tests/.gitignore                   |    5 -
 daemon/keyrings/tests/Makefile.am                  |   19 -
 daemon/keyrings/tests/test-data/encrypted.keyring  |  Bin 733 -> 0 bytes
 daemon/keyrings/tests/test-data/plain.keyring      |   55 -
 daemon/keyrings/tests/unit-test-keyring-file.c     |  248 --
 daemon/keyrings/tests/unit-test-keyring-login.c    |  157 -
 daemon/keyrings/tests/unit-test-login-prompt.c     |  128 -
 daemon/ui/gkr-ask-request.c                        |    5 +-
 daemon/util/Makefile.am                            |    5 +-
 daemon/util/gkr-location-watch.c                   |  365 --
 daemon/util/gkr-location-watch.h                   |   70 -
 daemon/util/tests/Makefile.am                      |    3 +-
 daemon/util/tests/unit-test-location-watch.c       |  245 --
 docs/reference/Makefile.am                         |    2 +-
 docs/reference/gnome-keyring/.gitignore            |   10 -
 docs/reference/gnome-keyring/Makefile.am           |   99 -
 .../gnome-keyring/gnome-keyring-docs.sgml          |   26 -
 .../gnome-keyring/gnome-keyring-sections.txt       |  183 -
 keyring-intro.txt                                  |  154 -
 library/.gitignore                                 |    8 -
 library/Makefile.am                                |   65 -
 library/gnome-keyring-1-uninstalled.pc.in          |   11 -
 library/gnome-keyring-1.pc.in                      |   11 -
 library/gnome-keyring-memory.c                     |  280 --
 library/gnome-keyring-memory.h                     |   66 -
 library/gnome-keyring-opcodes.h                    |   57 -
 library/gnome-keyring-private.h                    |   76 -
 library/gnome-keyring-proto.c                      | 1547 -------
 library/gnome-keyring-proto.h                      |  235 --
 library/gnome-keyring-result.h                     |   43 -
 library/gnome-keyring-socket.c                     |  248 --
 library/gnome-keyring-utils.c                      |  596 ---
 library/gnome-keyring.c                            | 4389 --------------------
 library/gnome-keyring.h                            |  523 ---
 library/tests/.gitignore                           |    4 -
 library/tests/Makefile.am                          |   17 -
 library/tests/unit-test-daemon-setup.c             |   81 -
 library/tests/unit-test-keyrings-prompt.c          |  273 --
 library/tests/unit-test-keyrings.c                 |  539 ---
 library/tests/unit-test-login-prompt.c             |  104 -
 library/tests/unit-test-memory.c                   |  128 -
 library/tests/unit-test-other.c                    |  105 -
 pam/gkr-pam-client.c                               |   17 +-
 pam/gkr-pam-module.c                               |   11 +-
 pam/gkr-pam.h                                      |    7 +-
 .../secret-store}/file-format.txt                  |    7 +-
 po/POTFILES.in                                     |    4 -
 po/POTFILES.skip                                   |    6 -
 tests/Makefile.am                                  |   29 +-
 tests/list-keyrings.c                              |  225 -
 tests/test-keyrings.c                              |  524 ---
 80 files changed, 33 insertions(+), 17636 deletions(-)
---
diff --git a/HACKING b/HACKING
index ea3e156..c48e5e4 100644
--- a/HACKING
+++ b/HACKING
@@ -14,18 +14,8 @@ http://live.gnome.org/GnomeKeyring/Architecture
 Gnome Keyring is made up of several distinct parts working on concert with 
 each other. These parts generally live in different directories:
 
-common
-   Deprecated. This code will shortly live elsewhere. Daemon code will be moved 
-   into daemon/ some code may move into egg/ etc...
-   
 daemon 
    The main daemon startup code and gnome-keyring password protocol operations. 
-   
-daemon/keyrings
-   Code that manages the user's password keyrings 
-
-daemon/pk
-   Old code, disappearing presently, not in use. 
 
 daemon/pkcs11
    The various hooks that connect the PKCS#11 modules and code into the daemon.
@@ -43,9 +33,6 @@ gcr
 gp11
    A public library for accessing PKCS#11 modules. 
 
-library
-   The gnome-keyring library for accessing passwords and secrets. 
-
 pam 
    The PAM module that unlocks the login keyring when the user logs in.
    
diff --git a/Makefile.am b/Makefile.am
index 8c4e10a..08c82ba 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,7 +15,6 @@ SUBDIRS = \
 	gp11 \
 	egg \
 	gcr \
-	library \
 	pkcs11 \
 	daemon \
 	tool \
@@ -28,7 +27,6 @@ EXTRA_DIST = \
 	intltool-extract.in \
 	intltool-merge.in \
 	intltool-update.in \
-	keyring-intro.txt \
 	ChangeLog.old \
 	HACKING
 
diff --git a/configure.in b/configure.in
index afaa402..81c1c0d 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-AC_INIT(library/gnome-keyring.h)
+AC_INIT(daemon/gkd-main.c)
 
 AM_INIT_AUTOMAKE(gnome-keyring, 2.29.4)
 AM_CONFIG_HEADER(config.h)
@@ -554,8 +554,6 @@ daemon/control/Makefile
 daemon/control/tests/Makefile
 daemon/data/Makefile
 daemon/dbus/Makefile
-daemon/keyrings/Makefile
-daemon/keyrings/tests/Makefile
 daemon/login/Makefile
 daemon/pkcs11/Makefile
 daemon/prompt/Makefile
@@ -566,7 +564,6 @@ daemon/util/tests/Makefile
 docs/Makefile
 docs/reference/Makefile
 docs/reference/gcr/Makefile
-docs/reference/gnome-keyring/Makefile
 docs/reference/gp11/Makefile
 egg/Makefile
 egg/tests/Makefile
@@ -576,8 +573,6 @@ gcr/tests/Makefile
 gp11/gp11.pc
 gp11/Makefile
 gp11/tests/Makefile
-library/Makefile
-library/tests/Makefile
 pam/Makefile
 pam/tests/Makefile
 pkcs11/Makefile
@@ -597,8 +592,6 @@ pkcs11/user-store/tests/Makefile
 po/Makefile.in
 tests/Makefile
 tool/Makefile
-library/gnome-keyring-1.pc
-library/gnome-keyring-1-uninstalled.pc
 ])
 
 # ------------------------------------------------------------------------------
diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index a0ce816..5e3143f 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -2,7 +2,6 @@ SUBDIRS = \
 	util \
 	ui \
 	prompt \
-	keyrings \
 	login \
 	control \
 	pkcs11 \
@@ -28,20 +27,16 @@ INCLUDES=	\
 
 gnome_keyring_daemon_SOURCES = \
 	gkd-main.c gkd-main.h \
-	gkd-util.c gkd-util.h \
-	gkr-daemon-io.c \
-	gkr-daemon-ops.c
+	gkd-util.c gkd-util.h
 
 gnome_keyring_daemon_LDADD = \
 	$(top_builddir)/daemon/pkcs11/libgkr-pkcs11.la \
 	$(top_builddir)/daemon/dbus/libgkr-dbus.la \
-	$(top_builddir)/daemon/keyrings/libgkr-keyrings.la \
 	$(top_builddir)/daemon/login/libgkd-login.la \
 	$(top_builddir)/daemon/ui/libgkr-ui.la \
 	$(top_builddir)/daemon/control/libgkd-control.la \
 	$(top_builddir)/daemon/prompt/libgkd-prompt.la \
 	$(top_builddir)/daemon/util/libgkr-daemon-util.la \
-	$(top_builddir)/library/libgnome-keyring-common.la \
 	$(top_builddir)/pkcs11/plex-layer/libgck-plex-layer.la \
 	$(top_builddir)/pkcs11/roots-store/libgck-roots-store.la \
 	$(top_builddir)/pkcs11/rpc-layer/libgck-rpc-layer.la \
diff --git a/daemon/control/Makefile.am b/daemon/control/Makefile.am
index 2fdcf78..79b2c0f 100644
--- a/daemon/control/Makefile.am
+++ b/daemon/control/Makefile.am
@@ -24,7 +24,8 @@ noinst_LTLIBRARIES = \
 	libgkd-control-client.la
 
 libgkd_control_la_SOURCES = \
-	gkd-control-server.c gkd-control-client.c gkd-control.h
+	gkd-control-server.c gkd-control-client.c \
+	gkd-control.h gkd-control-codes.h
 
 libgkd_control_client_la_SOURCES = \
 	gkd-control-client.c gkd-control.h
diff --git a/daemon/control/gkd-control-client.c b/daemon/control/gkd-control-client.c
index dedf6e0..43a7cc4 100644
--- a/daemon/control/gkd-control-client.c
+++ b/daemon/control/gkd-control-client.c
@@ -22,7 +22,7 @@
 #include "config.h"
 
 #include "gkd-control.h"
-#include "gkd-control-private.h"
+#include "gkd-control-codes.h"
 
 #include "egg/egg-buffer.h"
 #include "egg/egg-secure-memory.h"
diff --git a/daemon/control/gkd-control-private.h b/daemon/control/gkd-control-codes.h
similarity index 100%
rename from daemon/control/gkd-control-private.h
rename to daemon/control/gkd-control-codes.h
diff --git a/daemon/control/gkd-control-server.c b/daemon/control/gkd-control-server.c
index 87a50d7..fcb4daa 100644
--- a/daemon/control/gkd-control-server.c
+++ b/daemon/control/gkd-control-server.c
@@ -22,7 +22,7 @@
 #include "config.h"
 
 #include "gkd-control.h"
-#include "gkd-control-private.h"
+#include "gkd-control-codes.h"
 
 #include "gkd-main.h"
 #include "gkd-util.h"
diff --git a/daemon/control/tests/test-control-change b/daemon/control/tests/test-control-change
index e2236f4..1c78123 100755
Binary files a/daemon/control/tests/test-control-change and b/daemon/control/tests/test-control-change differ
diff --git a/daemon/control/tests/test-control-unlock b/daemon/control/tests/test-control-unlock
index d71dd09..9076760 100755
Binary files a/daemon/control/tests/test-control-unlock and b/daemon/control/tests/test-control-unlock differ
diff --git a/daemon/dbus/gkd-dbus-service.c b/daemon/dbus/gkd-dbus-service.c
index c076152..0455bbb 100644
--- a/daemon/dbus/gkd-dbus-service.c
+++ b/daemon/dbus/gkd-dbus-service.c
@@ -25,7 +25,6 @@
 
 #include "gkd-dbus-private.h"
 #include "gkd-util.h"
-#include "gkr-daemon.h"
 
 #include <dbus/dbus.h>
 
@@ -47,25 +46,11 @@ message_handler_cb (DBusConnection *conn, DBusMessage *message, void *user_data)
 	DBusMessageIter args;
 	DBusMessage *reply = NULL;
 
-	/* GetSocketPath */
+	/* GetEnvironment */
 	if (dbus_message_get_type (message) == DBUS_MESSAGE_TYPE_METHOD_CALL &&
-	    dbus_message_is_method_call (message, GNOME_KEYRING_DAEMON_INTERFACE, "GetSocketPath") &&
+	    dbus_message_is_method_call (message, GNOME_KEYRING_DAEMON_INTERFACE, "GetEnvironment") &&
 	    g_str_equal (dbus_message_get_signature (message), "")) {
 
-		const gchar *socket_path = gkr_daemon_io_get_socket_path ();
-		g_return_val_if_fail (socket_path, DBUS_HANDLER_RESULT_NOT_YET_HANDLED);
-
-		/* Setup the result */
-		reply = dbus_message_new_method_return (message);
-		dbus_message_iter_init_append (reply, &args);
-		if (!dbus_message_iter_append_basic (&args, DBUS_TYPE_STRING, &socket_path))
-			g_return_val_if_reached (DBUS_HANDLER_RESULT_NEED_MEMORY);
-
-	/* GetEnvironment */
-	} else if (dbus_message_get_type (message) == DBUS_MESSAGE_TYPE_METHOD_CALL &&
-	           dbus_message_is_method_call (message, GNOME_KEYRING_DAEMON_INTERFACE, "GetEnvironment") &&
-	           g_str_equal (dbus_message_get_signature (message), "")) {
-
 		const gchar **env;
 		DBusMessageIter items, entry;
 		gchar **parts;
diff --git a/daemon/gkd-main.c b/daemon/gkd-main.c
index b7d56b1..01d297b 100644
--- a/daemon/gkd-main.c
+++ b/daemon/gkd-main.c
@@ -25,7 +25,6 @@
 
 #include "gkd-main.h"
 #include "gkd-util.h"
-#include "gkr-daemon.h"
 
 #include "control/gkd-control.h"
 
@@ -633,14 +632,6 @@ fork_and_print_environment (void)
 static gboolean
 gkr_daemon_startup_steps (void)
 {
-	/*
-	 * Always initialize the keyring subsystem. This is a necessary
-	 * component that everything else depends on in one way or
-	 * another.
-	 */
-	if (!gkr_daemon_io_create_master_socket ())
-		return FALSE;
-
 	/* Startup the appropriate components, creates sockets etc.. */
 #ifdef WITH_SSH
 	if (check_run_component ("ssh")) {
diff --git a/daemon/gkd-util.c b/daemon/gkd-util.c
index 16a0730..23e6144 100644
--- a/daemon/gkd-util.c
+++ b/daemon/gkd-util.c
@@ -44,7 +44,6 @@
  */
 const gchar *GKD_UTIL_OUT_ENVIRONMENT[] = {
 	"SSH_AUTH_SOCK",
-	"GNOME_KEYRING_SOCKET",
 	"GNOME_KEYRING_CONTROL",
 	"GNOME_KEYRING_PID",
 	"SSH_AGENT_PID",
diff --git a/daemon/ui/gkr-ask-request.c b/daemon/ui/gkr-ask-request.c
index 4f952dc..da4a0d3 100644
--- a/daemon/ui/gkr-ask-request.c
+++ b/daemon/ui/gkr-ask-request.c
@@ -30,12 +30,9 @@
 
 #include "daemon/util/gkr-daemon-async.h"
 
+#include "egg/egg-buffer.h"
 #include "egg/egg-secure-memory.h"
 
-#include "library/gnome-keyring.h"
-#include "library/gnome-keyring-private.h"
-#include "library/gnome-keyring-proto.h"
-
 #include "util/gkr-location.h"
 
 #include <unistd.h>
diff --git a/daemon/util/Makefile.am b/daemon/util/Makefile.am
index e69ec16..af3a588 100644
--- a/daemon/util/Makefile.am
+++ b/daemon/util/Makefile.am
@@ -16,9 +16,8 @@ INCLUDES=	\
 libgkr_daemon_util_la_SOURCES = \
 	gkr-daemon-async.c gkr-daemon-async.h \
 	gkr-daemon-util.c gkr-daemon-util.h \
-	gkr-location.c gkr-location.h \
-	gkr-location-watch.c gkr-location-watch.h
-	
+	gkr-location.c gkr-location.h
+
 libgkr_daemon_util_la_LIBADD = \
 	$(GLIB_LIBS) \
 	$(GOBJECT_LIBS)
diff --git a/daemon/util/tests/Makefile.am b/daemon/util/tests/Makefile.am
index 250fbb1..ec80c74 100644
--- a/daemon/util/tests/Makefile.am
+++ b/daemon/util/tests/Makefile.am
@@ -1,7 +1,6 @@
 UNIT_AUTO = \
 	unit-test-async.c \
-	unit-test-location.c \
-	unit-test-location-watch.c
+	unit-test-location.c
 
 UNIT_PROMPT = 
 
diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index bcf7830..ad8f278 100644
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -1,2 +1,2 @@
 
-SUBDIRS = gcr gnome-keyring gp11
+SUBDIRS = gcr gp11
diff --git a/pam/gkr-pam-client.c b/pam/gkr-pam-client.c
index 88a2382..0d441ae 100644
--- a/pam/gkr-pam-client.c
+++ b/pam/gkr-pam-client.c
@@ -28,6 +28,8 @@
 #include "egg/egg-buffer.h"
 #include "egg/egg-unix-credentials.h"
 
+#include "daemon/control/gkd-control-codes.h"
+
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/socket.h>
@@ -214,7 +216,7 @@ connect_to_daemon (const char *control)
 }
 
 static void
-write_part (int fd, const unsigned char *data, int len, GnomeKeyringResult *res)
+write_part (int fd, const unsigned char *data, int len, int *res)
 {
 	assert (res);
 	
@@ -267,11 +269,10 @@ read_part (int fd, unsigned char *data, int len)
 	return all;
 }
 
-static GnomeKeyringResult 
-keyring_daemon_op (const char *control, GnomeKeyringOpCode op, int argc,
-                   const char* argv[])
+static int
+keyring_daemon_op (const char *control, int op, int argc, const char* argv[])
 {
-	GnomeKeyringResult ret = GNOME_KEYRING_RESULT_OK;
+	int ret = GNOME_KEYRING_RESULT_OK;
 	unsigned char buf[4];
 	int i, sock = -1;
 	uint oplen, l;
@@ -346,12 +347,12 @@ done:
 	return ret;
 }
 
-GnomeKeyringResult
+int
 gkr_pam_client_run_operation (struct passwd *pwd, const char *control,
-                              GnomeKeyringOpCode op, int argc, const char* argv[])
+                              int op, int argc, const char* argv[])
 {
 	struct sigaction ignpipe, oldpipe, defchld, oldchld;
-	GnomeKeyringResult res;
+	int res;
 	pid_t pid;
 	int status;
 	
diff --git a/pam/gkr-pam-module.c b/pam/gkr-pam-module.c
index 98e4ea7..4e561fd 100644
--- a/pam/gkr-pam-module.c
+++ b/pam/gkr-pam-module.c
@@ -31,8 +31,7 @@
 
 #include "gkr-pam.h"
 
-#include "library/gnome-keyring-result.h"
-#include "library/gnome-keyring-opcodes.h"
+#include "daemon/control/gkd-control-codes.h"
 
 #include <security/pam_appl.h>
 #include <security/pam_modules.h>
@@ -648,7 +647,7 @@ static int
 create_keyring (pam_handle_t *ph, struct passwd *pwd, const char *password)
 {
 	const char *control;
-	GnomeKeyringResult res;
+	int res;
 	const char *argv[2];
 	
 	assert (pwd);
@@ -679,7 +678,7 @@ static int
 unlock_keyring (pam_handle_t *ph, struct passwd *pwd, const char *password)
 {
 	const char *control;
-	GnomeKeyringResult res;
+	int res;
 	const char *argv[2];
 	
 	assert (pwd);
@@ -716,9 +715,9 @@ change_keyring_password (pam_handle_t *ph, struct passwd *pwd,
                          const char *password, const char *original)
 {
 	const char *control;
-	GnomeKeyringResult res;
 	const char *argv[3];
-	
+	int res;
+
 	assert (pwd);
 	assert (password);
 	assert (original);
diff --git a/pam/gkr-pam.h b/pam/gkr-pam.h
index 0a988fe..9d4a9b7 100644
--- a/pam/gkr-pam.h
+++ b/pam/gkr-pam.h
@@ -26,9 +26,6 @@
 
 #include <pwd.h>
 
-#include "library/gnome-keyring-opcodes.h"
-#include "library/gnome-keyring-result.h"
-
 #ifndef LOG_AUTHPRIV
 #define LOG_AUTHPRIV    LOG_AUTH
 #endif
@@ -38,7 +35,7 @@
 #define GKR_LOG_NOTICE  (LOG_NOTICE | LOG_AUTHPRIV)
 #define GKR_LOG_INFO    (LOG_INFO | LOG_AUTHPRIV)
 
-GnomeKeyringResult   gkr_pam_client_run_operation (struct passwd *pwd, const char *socket, 
-                                                   GnomeKeyringOpCode op, int argc, const char* argv[]);
+int       gkr_pam_client_run_operation (struct passwd *pwd, const char *socket,
+                                        int op, int argc, const char* argv[]);
 
 #endif /*GKRPAM_H_*/
diff --git a/daemon/keyrings/file-format.txt b/pkcs11/secret-store/file-format.txt
similarity index 95%
rename from daemon/keyrings/file-format.txt
rename to pkcs11/secret-store/file-format.txt
index e3c36a2..4d7b491 100644
--- a/daemon/keyrings/file-format.txt
+++ b/pkcs11/secret-store/file-format.txt
@@ -41,13 +41,13 @@ num_items *
 guin32 num_encrypted bytes
  encrypted data:
   bytes[16] encryted hash, (for decrypt ok verify)
-  
+
   num_items *
    string display_name
    string secret
    time_t ctime
    time_t mtime
-   
+
    string reserved_str
    guint[4] reserved_int2
 
@@ -65,5 +65,4 @@ guin32 num_encrypted bytes
      string reserved_str
      guint32 reserved_uint
 
-  zero padding to make even multiple of 16   
-
+  zero padding to make even multiple of 16
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 3b5a735..0fe92eb 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,11 +1,8 @@
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
-daemon/gkr-daemon-ops.c
 daemon/data/gnome-keyring.schemas.in
 daemon/gnome-keyring-daemon.desktop.in.in
 daemon/org.gnome.keyring.service.in
-daemon/keyrings/gkr-keyring-login.c
-daemon/keyrings/gkr-keyring.c
 daemon/pkcs11/gkr-pkcs11-auth.c
 daemon/ui/gkr-ask-tool.c
 daemon/util/gkr-location.c
@@ -18,6 +15,5 @@ gcr/gcr-certificate-details-widget.c
 gcr/gcr-importer.c
 gcr/gcr-parser.c
 gp11/gp11-misc.c
-library/gnome-keyring-utils.c
 pkcs11/gck/gck-certificate.c
 pkcs11/ssh-store/gck-ssh-private-key.c
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index acda45c..fcfbed8 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1,9 +1,3 @@
 daemon/gnome-keyring-daemon.desktop.in
-daemon/pk/gkr-pk-import.c
-daemon/pk/gkr-pk-index.c
-daemon/pk/gkr-pk-object.c
-daemon/pk/gkr-pk-storage.c
-daemon/pkix/gkr-pkix-parser.c
-daemon/pkix/gkr-pkix-serialize.c
 gcr/gcr-import-dialog.ui
 gcr/gcr-certificate-basics-widget.ui
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 6cb7808..bfd4967 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -15,32 +15,5 @@ LIBS = \
 	$(GTK_LIBS) \
 	$(GLIB_LIBS) \
 	$(GTHREAD_LIBS)
-	
-noinst_PROGRAMS= \
-	list-keyrings \
-	test-keyring \
-	test-keyring-two
-	
-# ------------------------------------------------------------------------------
-# Simply list all the keyrings and whatever they have access to
-
-list_keyrings_SOURCES = \
-	list-keyrings.c
-
-list_keyrings_LDADD = \
-	$(top_builddir)/library/libgnome-keyring.la
-
-# ------------------------------------------------------------------------------
-# A generic testing program
-
-test_keyring_SOURCES = \
-	test-keyrings.c
-
-test_keyring_LDADD = \
-	$(top_builddir)/library/libgnome-keyring.la
-
-test_keyring_two_SOURCES = \
-	test-keyrings.c
 
-test_keyring_two_LDADD = \
-	$(top_builddir)/library/libgnome-keyring.la
+noinst_PROGRAMS =
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]