Compiling GnuPG 1.2.0 on Solaris 2.7

[Werner Koch]

--=-=-=

On Thu, 26 Sep 2002 10:57:36 +0100, Steve Kennedy said:

> It barfs compiling gpgkeys_ldap.c

Can you please apply this patch to gpgkeys_ldap.c and try again?


--=-=-=
Content-Disposition: attachment; filename=x

2002-09-26  Werner Koch  <wk@gnupg.org>

	* gpgkeys_ldap.c (send_key): Removed non-constant initializers.

Index: gpgkeys_ldap.c
===================================================================
RCS file: /cvs/gnupg/gnupg/keyserver/gpgkeys_ldap.c,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -u -r1.8 -r1.8.2.1
--- gpgkeys_ldap.c	9 Sep 2002 20:36:12 -0000	1.8
+++ gpgkeys_ldap.c	26 Sep 2002 11:27:47 -0000	1.8.2.1
@@ -66,19 +66,14 @@
   char line[MAX_LINE];
   char *key[2]={0,0};
   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)

--=-=-=--