From b02099968748b559d0321a0e05e328dfa4dfcb81 Mon Sep 17 00:00:00 2001
From: Werner Koch <wk@gnupg.org>
Date: Fri, 14 Dec 2001 13:35:34 +0000
Subject: [PATCH] * sign.c (get_default_signer): Use keydb_classify_name here.

---
 sm/ChangeLog |  4 ++++
 sm/server.c  |  1 -
 sm/sign.c    | 10 +++++++++-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/sm/ChangeLog b/sm/ChangeLog
index 39049c91b..9609caa45 100644
--- a/sm/ChangeLog
+++ b/sm/ChangeLog
@@ -1,3 +1,7 @@
+2001-12-14  Werner Koch  <wk@gnupg.org>
+
+	* sign.c (get_default_signer): Use keydb_classify_name here.
+
 2001-12-14  Marcus Brinkmann  <marcus@g10code.de>
 
 	* call-agent.c (LINELENGTH): Removed.
diff --git a/sm/server.c b/sm/server.c
index 4e63fd969..59a40eae7 100644
--- a/sm/server.c
+++ b/sm/server.c
@@ -30,7 +30,6 @@
 #include "../assuan/assuan.h"
 
 #define set_error(e,t) assuan_set_error (ctx, ASSUAN_ ## e, (t))
-#define digitp(a) ((a) >= '0' && (a) <= '9')
 
 
 /* The filepointer for status message used in non-server mode */
diff --git a/sm/sign.c b/sm/sign.c
index 9093bccb2..fb64f15de 100644
--- a/sm/sign.c
+++ b/sm/sign.c
@@ -68,15 +68,23 @@ get_default_signer (void)
   const char key[] =
     "/CN=test cert 1,OU=Aegypten Project,O=g10 Code GmbH,L=Düsseldorf,C=DE";
 
+  KEYDB_SEARCH_DESC desc;
   KsbaCert cert = NULL;
   KEYDB_HANDLE kh = NULL;
   int rc;
 
+  rc = keydb_classify_name (key, &desc);
+  if (rc)
+    {
+      log_error ("failed to find default signer: %s\n", gnupg_strerror (rc));
+      return NULL;
+    }
+
   kh = keydb_new (0);
   if (!kh)
     return NULL;
 
-  rc = keydb_search_subject (kh, key);
+  rc = keydb_search (kh, &desc, 1);
   if (rc)
     {
       log_debug ("failed to find default certificate: rc=%d\n", rc);