summaryrefslogtreecommitdiffstats
path: root/keyserver
diff options
context:
space:
mode:
Diffstat (limited to 'keyserver')
-rw-r--r--keyserver/ChangeLog3
-rw-r--r--keyserver/gpgkeys_ldap.c11
2 files changed, 6 insertions, 8 deletions
diff --git a/keyserver/ChangeLog b/keyserver/ChangeLog
index c39ddf36e..f773b4676 100644
--- a/keyserver/ChangeLog
+++ b/keyserver/ChangeLog
@@ -1,5 +1,8 @@
2002-09-09 David Shaw <dshaw@jabberwocky.com>
+ * gpgkeys_ldap.c (get_key): Some compilers (RISC OS, HPUX c89)
+ don't like using variables as array initializers.
+
* gpgkeys_hkp.c (send_key): Use CRLF in headers.
2002-08-28 David Shaw <dshaw@jabberwocky.com>
diff --git a/keyserver/gpgkeys_ldap.c b/keyserver/gpgkeys_ldap.c
index 5c4501ce9..49b2b2e9c 100644
--- a/keyserver/gpgkeys_ldap.c
+++ b/keyserver/gpgkeys_ldap.c
@@ -174,16 +174,11 @@ int get_key(char *getkey)
int ret=-1,err,count;
struct keylist *dupelist=NULL;
char search[62];
-#ifndef __riscos__
- char *attrs[]={pgpkeystr,"pgpuserid","pgpkeyid","pgpcertid","pgprevoked",
+ char *attrs[]={"replaceme","pgpuserid","pgpkeyid","pgpcertid","pgprevoked",
"pgpdisabled","pgpkeycreatetime","modifytimestamp",
"pgpkeysize","pgpkeytype",NULL};
-#else
- char *attrs[]={"foobar","pgpuserid","pgpkeyid","pgpcertid","pgprevoked",
- "pgpdisabled","pgpkeycreatetime","modifytimestamp",
- "pgpkeysize","pgpkeytype",NULL};
- attrs[0]=pgpkeystr;
-#endif
+ attrs[0]=pgpkeystr; /* Some compilers don't like using variables as
+ array initializers. */
/* Build the search string */