diff options
| author | Werner Koch <[email protected]> | 2002-09-26 11:27:47 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2002-09-26 11:27:47 +0000 |
| commit | e440941db55a8cfc7d96ade3cca69136a6edf88d (patch) | |
| tree | 3b3943e44d855d265d05e41e742ce8d117930b7c | |
| parent | * Makefile.am: Link bftest with EGDLIBS (i.e. NETLIBS) as EGD uses (diff) | |
| download | gnupg-e440941db55a8cfc7d96ade3cca69136a6edf88d.tar.gz gnupg-e440941db55a8cfc7d96ade3cca69136a6edf88d.zip | |
* gpgkeys_ldap.c (send_key): Removed non-constant initializers.
| -rw-r--r-- | keyserver/ChangeLog | 4 | ||||
| -rw-r--r-- | keyserver/gpgkeys_ldap.c | 11 |
2 files changed, 7 insertions, 8 deletions
diff --git a/keyserver/ChangeLog b/keyserver/ChangeLog index 646df8c9a..71865b935 100644 --- a/keyserver/ChangeLog +++ b/keyserver/ChangeLog @@ -1,3 +1,7 @@ +2002-09-26 Werner Koch <[email protected]> + + * gpgkeys_ldap.c (send_key): Removed non-constant initializers. + 2002-09-19 David Shaw <[email protected]> * gpgkeys_hkp.c (get_key, search_key): Properly handle line diff --git a/keyserver/gpgkeys_ldap.c b/keyserver/gpgkeys_ldap.c index 49b2b2e9c..15a100d67 100644 --- a/keyserver/gpgkeys_ldap.c +++ b/keyserver/gpgkeys_ldap.c @@ -66,19 +66,14 @@ int send_key(void) 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) |