diff --git a/g10/keyserver.c b/g10/keyserver.c
new file mode 100644
index 000000000..9c7e6b963
--- /dev/null
+++ b/g10/keyserver.c
@@ -0,0 +1,988 @@
+/* keyserver.c - generic keyserver code
+ * Copyright (C) 2001 Free Software Foundation, Inc.
+ *
+ * This file is part of GnuPG.
+ *
+ * GnuPG 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.
+ *
+ * GnuPG 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
+ */
+
+#include <config.h>
+#include <string.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <errno.h>
+#include <string.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include "keyserver-internal.h"
+#include "types.h"
+#include "options.h"
+#include "memory.h"
+#include "keydb.h"
+#include "status.h"
+#include "i18n.h"
+#include "util.h"
+#include "main.h"
+#include "hkp.h"
+
+#if !(defined(HAVE_FORK) && defined(HAVE_PIPE))
+#define KEYSERVER_TEMPFILE_ONLY
+#endif
+
+#define KEYSERVER_PROTO_VERSION 0
+
+#define GET    0
+#define SEND   1
+#define SEARCH 2
+
+void parse_keyserver_options(char *options)
+{
+  char *tok="";
+
+  do
+    {
+      if(strcasecmp(tok,"fast-import")==0)
+	opt.keyserver_options.fast_import=1;
+      else if(strcasecmp(tok,"no-fast-import")==0)
+	opt.keyserver_options.fast_import=0;
+      else if(strcasecmp(tok,"include-revoked")==0)
+	opt.keyserver_options.include_revoked=1;
+      else if(strcasecmp(tok,"no-include-revoked")==0)
+	opt.keyserver_options.include_revoked=0;
+      else if(strcasecmp(tok,"include-disabled")==0)
+	opt.keyserver_options.include_disabled=1;
+      else if(strcasecmp(tok,"no-include-disabled")==0)
+	opt.keyserver_options.include_disabled=0;
+#ifdef KEYSERVER_TEMPFILE_ONLY
+      else if(strcasecmp(tok,"use-temp-files")==0 ||
+	      strcasecmp(tok,"no-use-temp-files")==0)
+	log_info(_("Warning: keyserver option \"%s\" is not used "
+		   "on this platform\n"),tok);
+#else
+      else if(strcasecmp(tok,"use-temp-files")==0)
+	opt.keyserver_options.use_temp_files=1;
+      else if(strcasecmp(tok,"no-use-temp-files")==0)
+	opt.keyserver_options.use_temp_files=0;
+#endif
+      else if(strcasecmp(tok,"keep-temp-files")==0)
+	opt.keyserver_options.keep_temp_files=1;
+      else if(strcasecmp(tok,"no-keep-temp-files")==0)
+	opt.keyserver_options.keep_temp_files=0;
+      else if(strcasecmp(tok,"verbose")==0)
+	opt.keyserver_options.verbose++;
+      else if(strcasecmp(tok,"no-verbose")==0)
+	opt.keyserver_options.verbose--;
+      else if(strcasecmp(tok,"honor-http-proxy")==0)
+	opt.honor_http_proxy=1;
+      else if(strcasecmp(tok,"no-honor-http-proxy")==0)
+	opt.honor_http_proxy=0;
+      else if(strlen(tok)>0)
+	add_to_strlist(&opt.keyserver_options.other,tok);
+
+      tok=strsep(&options," ,");
+    }
+    while(tok!=NULL);
+}
+
+int parse_keyserver_uri(char *uri)
+{
+  /* Get the scheme */
+
+  opt.keyserver_scheme=strsep(&uri,":");
+  if(uri==NULL)
+    {
+      uri=opt.keyserver_scheme;
+      opt.keyserver_scheme="x-hkp";
+    }
+
+  /* Skip the "//", if any */
+  if(strlen(uri)>2 && uri[0]=='/' && uri[1]=='/')
+    uri+=2;
+
+  /* Get the host */
+  opt.keyserver_host=strsep(&uri,":/");
+  if(uri==NULL)
+    opt.keyserver_port="0";
+  else
+    {
+      /* Get the port */
+      opt.keyserver_port=strsep(&uri,"/");
+      if(atoi(opt.keyserver_port)==0)
+	opt.keyserver_port="0";
+    }
+
+  /* (any path part of the URI is discarded) */
+
+  if(opt.keyserver_scheme[0]=='\0' || opt.keyserver_host[0]=='\0')
+    return G10ERR_BAD_URI;
+
+  return 0;
+}
+
+/* Unquote only the delimiter character */
+static void printunquoted(char *string,char delim)
+{
+  char *ch=string;
+
+  while(*ch)
+    {
+      if(*ch=='\\')
+	{
+	  int c;
+
+	  sscanf(ch,"\\x%02X",&c);
+	  if(c==delim)
+	    {
+	      printf("%c",c);
+	      ch+=3;
+	    }
+	  else
+	    fputc(*ch,stdout);
+	}
+      else
+	fputc(*ch,stdout);
+
+      ch++;
+    }
+}
+
+static int print_keyinfo(int count,char *keystring,u32 *keyid)
+{
+  char *certid,*userid,*keytype,*tok;
+  int flags,keysize=0;
+  time_t createtime=0,expiretime=0,modifytime=0;
+
+  if((certid=strsep(&keystring,":"))==NULL)
+    return -1;
+
+  /* Ideally this is the long key ID, but HKP uses the short key
+     ID. */
+  if(sscanf(certid,"%08lX%08lX",(ulong *)&keyid[0],(ulong *)&keyid[1])!=2)
+    {
+      keyid[0]=0;
+      if(sscanf(certid,"%08lX",(ulong *)&keyid[1])!=1)
+	return -1;
+    }
+
+  if((tok=strsep(&keystring,":"))==NULL)
+    return -1;
+
+  userid=utf8_to_native(tok,strlen(tok),0);
+
+  if((tok=strsep(&keystring,":"))==NULL)
+    return -1;
+
+  flags=atoi(tok);
+
+  if((tok=strsep(&keystring,":"))==NULL)
+    return -1;
+
+  createtime=atoi(tok);
+
+  if((tok=strsep(&keystring,":"))==NULL)
+    return -1;
+
+  expiretime=atoi(tok);
+
+  if((tok=strsep(&keystring,":"))==NULL)
+    return -1;
+
+  modifytime=atoi(tok);
+
+  if((keytype=strsep(&keystring,":"))==NULL)
+    return -1;
+
+  /* The last one */
+  if(keystring!=NULL)
+    keysize=atoi(keystring);
+
+  printf("(%d)\t",count);
+
+  printunquoted(userid,':');
+
+  if(flags&1)
+    printf(" (revoked)");
+  if(flags&2)
+    printf(" (disabled)");
+
+  if(keytype[0])
+    printf(" %s",keytype);
+
+  if(keysize>0)
+    printf(" %d",keysize);
+
+  printf("\n\t  created %s,",strtimestamp(createtime));
+
+  if(expiretime>0)
+    printf(" expires %s,",strtimestamp(expiretime));
+
+  printf(" keyid %s\n",certid);
+
+  return 0;
+}
+
+static int keyserver_spawn(int action,STRLIST list,u32 (*kidlist)[2],int count)
+{
+  int ret=KEYSERVER_INTERNAL_ERROR,i,to[2]={-1,-1},from[2]={-1,-1};
+  pid_t child=0;
+  STRLIST temp;
+  unsigned int maxlen=256,buflen;
+  char *filename=NULL,*tempfile_in=NULL,*tempfile_out=NULL,*searchstr=NULL;
+  char *tempdir=NULL;
+  byte *line=NULL;
+  FILE *tochild=NULL;
+  IOBUF fromchild=NULL;
+  int gotversion=0,madedir=0;
+
+  /* Build the filename for the helper to execute */
+
+  filename=m_alloc(strlen("gpgkeys_")+strlen(opt.keyserver_scheme)+1);
+
+  strcpy(filename,"gpgkeys_");
+  strcat(filename,opt.keyserver_scheme);
+
+  if(opt.keyserver_options.use_temp_files)
+    {
+      const char *tmp=get_temp_dir();
+
+      tempdir=m_alloc(strlen(tmp)+1+8+11+1);
+      sprintf(tempdir,"%s" DIRSEP_S "gpg-XXXXXX",tmp);
+
+      /* Yes, I'm using mktemp.  No, this isn't automatically insecure
+         because of it.  I am using it to make a temp dir, not a file,
+         and I happily fail if it already exists. */
+
+      mktemp(tempdir);
+
+      tempfile_in=m_alloc(strlen(tempdir)+1+10+1);
+      sprintf(tempfile_in,"%s" DIRSEP_S "ksrvin" EXTSEP_S "txt",tempdir);
+
+      tempfile_out=m_alloc(strlen(tempdir)+1+11+1);
+      sprintf(tempfile_out,"%s" DIRSEP_S "ksrvout" EXTSEP_S "txt",tempdir);
+
+      if(mkdir(tempdir,0700)==-1)
+	{
+	  log_error(_("%s: can't create directory: %s\n"),
+		    tempdir,strerror(errno));
+	  goto fail;
+	}
+
+      madedir=1;
+
+      tochild=fopen(tempfile_in,"w");
+      if(tochild==NULL)
+	{
+	  log_error(_("%s: can't create: %s\n"),tempfile_in,strerror(errno));
+	  goto fail;
+	}
+    }
+  else
+    {
+      if(pipe(to)==-1)
+	goto fail;
+
+      if(pipe(from)==-1)
+	goto fail;
+
+      if((child=fork())==-1)
+	goto fail;
+
+      if(child==0)
+	{
+	  /* I'm the child */
+
+	  /* implied close of STDERR */
+	  if(dup2(STDOUT_FILENO,STDERR_FILENO)==-1)
+	    _exit(KEYSERVER_INTERNAL_ERROR);
+
+	  close(from[0]);
+	  from[0]=-1;
+
+	  /* implied close of STDOUT */
+	  if(dup2(from[1],STDOUT_FILENO)==-1)
+	    _exit(KEYSERVER_INTERNAL_ERROR);
+
+	  close(to[1]);
+	  to[1]=-1;
+
+	  /* implied close of STDIN */
+	  if(dup2(to[0],STDIN_FILENO)==-1)
+	    _exit(KEYSERVER_INTERNAL_ERROR);
+
+	  execlp(filename,filename,NULL);
+
+	  /* If we get this far the exec failed.  Clean up and return. */
+
+	  if(opt.keyserver_options.verbose>2)
+	    log_error(_("Unable to execute %s: %s\n"),
+		      filename,strerror(errno));
+
+	  if(errno==ENOENT)
+	    _exit(KEYSERVER_SCHEME_NOT_FOUND);
+
+	  _exit(KEYSERVER_INTERNAL_ERROR);
+	}
+
+      /* I'm the parent */
+
+      close(to[0]);
+      to[0]=-1;
+
+      tochild=fdopen(to[1],"w");
+      if(tochild==NULL)
+	{
+	  ret=G10ERR_WRITE_FILE;
+	  close(to[1]);
+	  goto fail;
+	}
+
+      close(from[1]);
+      from[1]=-1;
+
+      fromchild=iobuf_fdopen(from[0],"r");
+      if(fromchild==NULL)
+	{
+	  ret=G10ERR_READ_FILE;
+	  goto fail;
+	}
+    }
+
+  fprintf(tochild,"# This is a gpg keyserver communications file\n");
+  fprintf(tochild,"VERSION %d\n",KEYSERVER_PROTO_VERSION);
+  fprintf(tochild,"PROGRAM %s\n",VERSION);
+  fprintf(tochild,"HOST %s\n",opt.keyserver_host);
+
+  if(atoi(opt.keyserver_port)>0)
+    fprintf(tochild,"PORT %s\n",opt.keyserver_port);
+
+  /* Write options */
+
+  fprintf(tochild,"OPTION %sinclude-revoked\n",
+	  opt.keyserver_options.include_revoked?"":"no-");
+
+  fprintf(tochild,"OPTION %sinclude-disabled\n",
+	  opt.keyserver_options.include_disabled?"":"no-");
+
+  for(i=0;i<opt.keyserver_options.verbose;i++)
+    fprintf(tochild,"OPTION verbose\n");
+
+  temp=opt.keyserver_options.other;
+
+  for(;temp;temp=temp->next)
+    fprintf(tochild,"OPTION %s\n",temp->d);
+
+  switch(action)
+    {
+    case GET:
+      {
+	int i;
+
+	fprintf(tochild,"COMMAND GET\n\n");
+
+	/* Which keys do we want? */
+
+	for(i=0;i<count;i++)
+	  fprintf(tochild,"0x%08lX%08lX\n",
+		  (ulong)kidlist[i][0],(ulong)kidlist[i][1]);
+
+	fprintf(tochild,"\n");
+
+	break;
+      }
+
+    case SEND:
+      {
+	STRLIST key,temp;
+
+	/* Note the extra \n here to send an empty keylist block */
+	fprintf(tochild,"COMMAND SEND\n\n\n");
+
+	for(key=list;key!=NULL;key=key->next)
+	  {
+	    armor_filter_context_t afx;
+	    IOBUF buffer=iobuf_temp();
+
+	    temp=NULL;
+	    add_to_strlist(&temp,key->d);
+
+	    memset(&afx,0,sizeof(afx));
+	    afx.what=1;
+	    iobuf_push_filter(buffer,armor_filter,&afx);
+
+	    if(export_pubkeys_stream(buffer,key,1)==-1)
+	      iobuf_close(buffer);
+	    else
+	      {
+		iobuf_flush_temp(buffer);
+
+		fprintf(tochild,"KEY %s BEGIN\n",key->d);
+		fwrite(iobuf_get_temp_buffer(buffer),
+		       iobuf_get_temp_length(buffer),1,tochild);
+		fprintf(tochild,"KEY %s END\n",key->d);
+
+		iobuf_close(buffer);
+	      }
+
+	    free_strlist(temp);
+	  }
+
+	break;
+      }
+
+    case SEARCH:
+      {
+	STRLIST key;
+
+	fprintf(tochild,"COMMAND SEARCH\n\n");
+
+	/* Which keys do we want?  Remember that the gpgkeys_ program
+           is going to lump these together into a search string. */
+
+	for(key=list;key!=NULL;key=key->next)
+	  {
+	    fprintf(tochild,"%s\n",key->d);
+	    if(key!=list)
+	      {
+		searchstr=m_realloc(searchstr,
+				    strlen(searchstr)+strlen(key->d)+2);
+		strcat(searchstr," ");
+	      }
+	    else
+	      {
+		searchstr=m_alloc(strlen(key->d)+1);
+		searchstr[0]='\0';
+	      }
+
+	    strcat(searchstr,key->d);
+	  }
+
+	fprintf(tochild,"\n");
+
+	break;
+      }
+
+    default:
+      log_fatal(_("no keyserver action!\n"));
+      break;
+    }
+
+  /* Done sending */
+  fclose(tochild);
+  tochild=NULL;
+  to[1]=-1;
+
+  if(opt.keyserver_options.use_temp_files)
+    {
+      char *command=m_alloc(strlen(filename)+2+
+			    strlen(tempfile_in)+6+
+			    strlen(tempfile_out)+2);
+
+      sprintf(command,"%s -o \"%s\" \"%s\"",filename,tempfile_out,tempfile_in);
+
+      ret=system(command);
+
+      m_free(command);
+
+      ret=WEXITSTATUS(ret);
+
+      if(ret==127)
+	{
+	  log_error(_("Unable to exec keyserver program\n"));
+	  goto fail;
+	}
+
+      if(ret==-1)
+	{
+	  log_error(_("Internal system error while calling keyserver: %s\n"),
+		    strerror(errno));
+	  goto fail;
+	}
+
+      fromchild=iobuf_open(tempfile_out);
+      if(fromchild==NULL)
+	{
+	  log_error(_("Unable to read keyserver response: %s\n"),
+		    strerror(errno));
+	  goto fail;
+	}
+    }
+
+  /* Now handle the response */
+
+  do
+    {
+      if(iobuf_read_line(fromchild,&line,&buflen,&maxlen)==0)
+	{
+	  ret=G10ERR_READ_FILE;
+	  goto fail; /* i.e. EOF */
+	}
+
+      if(strncasecmp(line,"VERSION ",8)==0)
+	{
+	  gotversion=1;
+
+	  if(atoi(&line[8])!=KEYSERVER_PROTO_VERSION)
+	    {
+	      log_error(_("Invalid keyserver protocol (us %d!=handler %d)\n"),
+			KEYSERVER_PROTO_VERSION,atoi(&line[8]));
+	      goto fail;
+	    }
+	}
+
+      if(strncasecmp(line,"PROGRAM ",8)==0)
+	{
+	  line[strlen(line)-1]='\0';
+	  if(strcasecmp(&line[8],VERSION)!=0)
+	    log_info(_("Warning: keyserver handler from a different "
+		       "version of GnuPG (%s)\n"),&line[8]);
+	}
+    }
+  while(line[0]!='\n');
+
+  if(!gotversion)
+    {
+      log_error(_("Keyserver communications error\n"));
+      goto fail;
+    }
+
+  switch(action)
+    {
+    case GET:
+      {
+	void *stats_handle;
+
+	stats_handle=import_new_stats_handle();
+
+	/* Slurp up all the key data.  In the future, it might be nice
+	   to look for KEY foo OUTOFBAND and FAILED indicators.  It's
+	   harmless to ignore them, but ignoring them does make gpg
+	   complain about "no valid OpenPGP data found".  One way to
+	   do this could be to continue parsing this line-by-line and
+	   make a temp iobuf for each key. */
+
+	import_keys_stream(fromchild,
+			   opt.keyserver_options.fast_import,stats_handle);
+
+	import_print_stats(stats_handle);
+	import_release_stats_handle(stats_handle);
+
+	break;
+      }
+
+      /* Nothing to do here */
+    case SEND:
+      break;
+
+    case SEARCH:
+      {
+	byte *line=NULL;
+	unsigned int buflen=0,maxlen=80;
+	int count;
+
+	/* Look for the COUNT line */
+	do
+	  {
+	    if(iobuf_read_line(fromchild,&line,&buflen,&maxlen)==0)
+	      {
+		ret=G10ERR_READ_FILE;
+		goto fail; /* i.e. EOF */
+	      }
+	  }
+	while(sscanf(line,"COUNT %d\n",&count)!=1);
+
+	keyserver_search_prompt(fromchild,count,searchstr);
+
+	break;
+      }
+
+    default:
+      log_fatal(_("no keyserver action!\n"));
+      break;
+    }
+
+  iobuf_close(fromchild);
+  fromchild=NULL;
+  ret=0;
+
+ fail:
+  if(tochild!=NULL)
+    {
+      fclose(tochild);
+      to[1]=-1;
+    }
+
+  if(fromchild!=NULL)
+    {
+      iobuf_close(fromchild);
+      from[0]=-1;
+    }
+
+  if(from[0]>-1)
+    close(from[0]);
+  if(from[1]>-1)
+    close(from[1]);
+
+  if(to[0]>-1)
+    close(to[0]);
+  if(to[1]>-1)
+    close(to[1]);
+
+  if(child>0)
+    {
+      int rc;
+
+      waitpid(child,&rc,0);
+      if(ret==0 && WIFEXITED(rc))
+	ret=WEXITSTATUS(rc);
+    }
+
+  m_free(filename);
+
+  if(madedir && !opt.keyserver_options.keep_temp_files)
+    {
+      unlink(tempfile_in);
+      unlink(tempfile_out);
+      rmdir(tempdir);
+    }
+
+  m_free(tempfile_in);
+  m_free(tempfile_out);
+  m_free(tempdir);
+
+  return ret;
+}
+
+static int keyserver_work(int action,STRLIST list,u32 (*kidlist)[2],int count)
+{
+  int rc=0;
+
+#ifdef KEYSERVER_TEMPFILE_ONLY
+  opt.keyserver_options.use_temp_files=1;
+#endif
+
+  if(opt.keyserver_scheme==NULL ||
+     opt.keyserver_host==NULL ||
+     opt.keyserver_port==NULL)
+    {
+      log_error(_("no keyserver known (use option --keyserver)\n"));
+      return G10ERR_BAD_URI;
+    }
+
+  /* Use the internal HKP code */
+  if(strcasecmp(opt.keyserver_scheme,"x-hkp")==0 ||
+     strcasecmp(opt.keyserver_scheme,"hkp")==0 ||
+     strcasecmp(opt.keyserver_scheme,"x-broken-hkp")==0)
+    {
+      void *stats_handle = import_new_stats_handle ();
+
+      switch(action)
+	{
+	case GET:
+	  for(count--;count>=0;count--)
+	    if(hkp_ask_import(kidlist[count],stats_handle))
+	      log_inc_errorcount();
+	  break;
+	case SEND:
+	  return hkp_export(list);
+	case SEARCH:
+	  return hkp_search(list);
+	}
+
+      import_print_stats (stats_handle);
+      import_release_stats_handle (stats_handle);
+
+      return 0;
+    }
+
+  /* It's not the internal HKP code, so try and spawn a handler for it */
+
+  if((rc=keyserver_spawn(action,list,kidlist,count)))
+    {
+      switch(rc)
+	{
+	case KEYSERVER_SCHEME_NOT_FOUND:
+	  log_error(_("No handler for keyserver scheme \"%s\"\n"),
+		    opt.keyserver_scheme);
+	  break;
+
+	case KEYSERVER_INTERNAL_ERROR:
+	default:
+	  log_error(_("Keyserver internal error\n"));
+	  break;
+	}
+
+      /* This is not the best error code for this */
+      return G10ERR_INVALID_URI;
+    }
+
+  return 0;
+}
+
+int keyserver_export(STRLIST users)
+{
+  return keyserver_work(SEND,users,NULL,0);
+}
+
+int keyserver_import(STRLIST users)
+{
+  u32 (*kidlist)[2];
+  int num=100,count=0;
+  int rc=0;
+
+  /* Build a list of key ids */
+
+  kidlist=m_alloc(sizeof(u32)*2*num);
+
+  for(;users;users=users->next)
+    {
+      KEYDB_SEARCH_DESC desc;
+
+      classify_user_id (users->d, &desc);
+      if(desc.mode==KEYDB_SEARCH_MODE_SHORT_KID ||
+	 desc.mode==KEYDB_SEARCH_MODE_LONG_KID)
+	{
+	  kidlist[count][0]=desc.u.kid[0]; 
+	  kidlist[count][1]=desc.u.kid[1]; 
+	  count++;
+	  if(count==num)
+	    {
+	      num+=100;
+	      kidlist=m_realloc(kidlist,sizeof(u32)*2*num);
+	    }
+	}
+      else
+	{
+	  log_error (_("Skipping invalid key ID \"%s\"\n"), users->d );
+	  continue;
+	}
+    }
+
+  if(count>0)
+    rc=keyserver_work(GET,NULL,kidlist,count);
+
+  m_free(kidlist);
+
+  return rc;
+}
+
+int keyserver_import_keyid(u32 *keyid)
+{
+  STRLIST sl=NULL;
+  char key[17];
+  int ret;
+
+  sprintf(key,"%08lX%08lX",(ulong)keyid[0],(ulong)keyid[1]);
+
+  add_to_strlist(&sl,key);
+
+  ret=keyserver_import(sl);
+
+  free_strlist(sl);
+
+  return ret;
+}
+
+/* code mostly stolen from do_export_stream */
+static int keyidlist(STRLIST users,u32 (**kidlist)[2],int *count)
+{
+  int rc=0,ndesc,num=100;
+  KBNODE keyblock=NULL,node;
+  KEYDB_HANDLE kdbhd;
+  KEYDB_SEARCH_DESC *desc;
+  STRLIST sl;
+
+  *count=0;
+
+  *kidlist=m_alloc(sizeof(u32)*2*num);
+
+  kdbhd=keydb_new(0);
+
+  if(!users)
+    {
+      ndesc = 1;
+      desc = m_alloc_clear ( ndesc * sizeof *desc);
+      desc[0].mode = KEYDB_SEARCH_MODE_FIRST;
+    }
+  else
+    {
+      for (ndesc=0, sl=users; sl; sl = sl->next, ndesc++) 
+	;
+      desc = m_alloc ( ndesc * sizeof *desc);
+        
+      for (ndesc=0, sl=users; sl; sl = sl->next)
+	{
+	  if(classify_user_id (sl->d, desc+ndesc))
+	    ndesc++;
+	  else
+	    log_error (_("key `%s' not found: %s\n"),
+		       sl->d, g10_errstr (G10ERR_INV_USER_ID));
+	}
+    }
+
+  while (!(rc = keydb_search (kdbhd, desc, ndesc)))
+    {
+      if (!users) 
+	desc[0].mode = KEYDB_SEARCH_MODE_NEXT;
+
+      /* read the keyblock */
+      rc = keydb_get_keyblock (kdbhd, &keyblock );
+      if( rc )
+	{
+	  log_error (_("error reading keyblock: %s\n"), g10_errstr(rc) );
+	  goto leave;
+	}
+
+      if((node=find_kbnode(keyblock,PKT_PUBLIC_KEY)))
+	{
+	  keyid_from_pk(node->pkt->pkt.public_key,(*kidlist)[*count]);
+
+	  (*count)++;
+
+	  if(*count==num)
+	    {
+	      num+=100;
+	      *kidlist=m_realloc(*kidlist,sizeof(u32)*2*num);
+	    }
+	}
+    }
+
+  if( rc == -1 )
+    rc = 0;
+
+  leave:
+    keydb_release(kdbhd);
+    release_kbnode(keyblock);
+
+    return rc;
+}
+
+/* Note this is different than the original HKP refresh.  It allows
+   usernames to refresh only part of the keyring. */
+
+int keyserver_refresh(STRLIST users)
+{
+  int rc;
+  u32 (*kidlist)[2];
+  int count;
+
+  rc=keyidlist(users,&kidlist,&count);
+  if(rc)
+    return rc;
+
+  log_info(_("%d key%s to refresh\n"),count,count!=1?"s":"");
+
+  if(count>0)
+    rc=keyserver_work(GET,NULL,kidlist,count);
+
+  m_free(kidlist);
+
+  return 0;
+}
+
+int keyserver_search(STRLIST tokens)
+{
+  if(tokens)
+    return keyserver_work(SEARCH,tokens,NULL,0);
+  else
+    return 0;
+}
+
+/* Count is just for cosmetics.  If it is too small, it will grow
+   safely.  If it negative it disables the "Key x-y of z" messages. */
+void keyserver_search_prompt(IOBUF buffer,int count,const char *searchstr)
+{
+  int i=0,validcount=1;
+  unsigned int maxlen=256,buflen=0;
+  u32 (*keyids)[2];
+  byte *line=NULL;
+  char *answer;
+
+  if(count==0)
+    {
+      if(searchstr)
+	log_info(_("Key \"%s\" not found on keyserver\n"),searchstr);
+      else
+	log_info(_("Key not found on keyserver\n"));
+      return;
+    }
+
+  if(count<0)
+    {
+      validcount=0;
+      count=1;
+    }
+
+  keyids=m_alloc(count*sizeof(u32)*2);
+
+  /* Read each line and show it to the user */
+
+  for(;;)
+    {
+      int rl;
+
+      if(i==count)
+	{
+	  count++;
+	  keyids=m_realloc(keyids,count*sizeof(u32)*2);
+	  validcount=0;
+	}
+
+      i++;
+
+      if(validcount && (i-1)%10==0)
+	{
+	  printf("Keys %d-%d of %d",i,(i+9<count)?i+9:count,count);
+	  printf(" for \"%s\"",searchstr);
+	  printf("\n");
+	}
+
+      maxlen=1024;
+      rl=iobuf_read_line(buffer,&line,&buflen,&maxlen);
+      if(rl>0)
+	{
+	  if(print_keyinfo(i,line,keyids[i-1]))
+	    continue;
+	}
+      else
+	i--;
+
+      if(i%10==0 || rl==0)
+	{
+	  answer=cpr_get_no_help("keysearch.prompt",
+				 _("Enter number(s), N)ext, or Q)uit > "));
+	  if(answer[0]=='q' || answer[0]=='Q')
+	    {
+	      m_free(answer);
+	      break;
+	    }
+	  else if(atoi(answer)>=1 && atoi(answer)<=i)
+	    {
+	      char *split=answer,*num;
+
+	      while((num=strsep(&split," ,"))!=NULL)
+		if(atoi(num)>=1 && atoi(num)<=i)
+		  keyserver_import_keyid(keyids[atoi(num)-1]);
+
+	      m_free(answer);
+	      break;
+	    }
+	}
+    }
+
+  m_free(keyids);
+  m_free(line);
+}