From stable branch
authorDavid Shaw <dshaw@jabberwocky.com>
Fri, 27 Sep 2002 19:33:52 +0000 (19:33 +0000)
committerDavid Shaw <dshaw@jabberwocky.com>
Fri, 27 Sep 2002 19:33:52 +0000 (19:33 +0000)
* gpgkeys_ldap.c (send_key): Removed non-constant initializers.

keyserver/ChangeLog
keyserver/gpgkeys_ldap.c

index 0ac86dc..c0a3acb 100644 (file)
@@ -1,3 +1,7 @@
+2002-09-26  Werner Koch  <wk@gnupg.org>
+
+       * gpgkeys_ldap.c (send_key): Removed non-constant initializers.
+
 2002-09-24  David Shaw  <dshaw@jabberwocky.com>
 
        * gpgkeys_ldap.c (ldap_err_to_gpg_err, ldap_to_gpg_err, send_key,
index 49b372b..0aba452 100644 (file)
@@ -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)