aboutsummaryrefslogtreecommitdiffstats
path: root/g10/keyserver.c
diff options
context:
space:
mode:
Diffstat (limited to 'g10/keyserver.c')
-rw-r--r--g10/keyserver.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/g10/keyserver.c b/g10/keyserver.c
index df7ef48e9..377418bec 100644
--- a/g10/keyserver.c
+++ b/g10/keyserver.c
@@ -148,7 +148,7 @@ parse_keyserver_uri(char *uri,const char *configname,unsigned int configlineno)
/* Get the host */
opt.keyserver_host=strsep(&uri,":/");
- if(uri==NULL)
+ if(uri==NULL || uri[0]=='\0')
opt.keyserver_port="0";
else
{
@@ -638,6 +638,11 @@ keyserver_work(int action,STRLIST list,KEYDB_SEARCH_DESC *desc,int count)
}
#endif
+#ifdef DISABLE_KEYSERVER_HELPERS
+ log_error(_("external keyserver calls are not supported in this build\n"));
+ return G10ERR_KEYSERVER;
+#endif
+
/* It's not the internal HKP code, so try and spawn a handler for it */
rc=keyserver_spawn(action,list,desc,count,&ret);