From e18ddb60ff3f7e7a8f3a6e22153823bdbdc9d7b0 Mon Sep 17 00:00:00 2001
From: David Shaw <dshaw@jabberwocky.com>
Date: Fri, 27 Sep 2002 19:33:52 +0000
Subject: From stable branch * gpgkeys_ldap.c (send_key): Removed non-constant
 initializers.

---
 keyserver/gpgkeys_ldap.c | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

(limited to 'keyserver/gpgkeys_ldap.c')

diff --git a/keyserver/gpgkeys_ldap.c b/keyserver/gpgkeys_ldap.c
index 49b372b79..0aba452b9 100644
--- a/keyserver/gpgkeys_ldap.c
+++ b/keyserver/gpgkeys_ldap.c
@@ -110,19 +110,14 @@ send_key(int *eof)
   char line[MAX_LINE];
   char *key[2]={NULL,NULL};
   char keyid[17];
-#ifndef __riscos__
-  LDAPMod mod={LDAP_MOD_ADD,pgpkeystr,{key}},*attrs[2]={&mod,NULL};
-#else
   LDAPMod mod, *attrs[2];
-  
+
+  memset (&mod, 0, sizeof mod);
   mod.mod_op      = LDAP_MOD_ADD;
   mod.mod_type    = pgpkeystr;
-  mod.mod_values  = 0;
-  mod.mod_bvalues = 0;
-  
+  mod.mod_values  = key;
   attrs[0]    = &mod;
   attrs[1]    = NULL;
-#endif
 
   dn=malloc(strlen("pgpCertid=virtual,")+strlen(basekeyspacedn)+1);
   if(dn==NULL)
-- 
cgit v1.2.3