diff options
| author | David Shaw <dshaw@jabberwocky.com> | 2002-09-27 21:33:52 +0200 |
|---|---|---|
| committer | David Shaw <dshaw@jabberwocky.com> | 2002-09-27 21:33:52 +0200 |
| commit | e18ddb60ff3f7e7a8f3a6e22153823bdbdc9d7b0 (patch) | |
| tree | ed20c5fb4625b4b4b978c68ee4e77de9575823b5 /keyserver | |
| parent | * Makefile.am, md.c (load_digest_module): TIGER is now always enabled. (diff) | |
| download | gnupg2-e18ddb60ff3f7e7a8f3a6e22153823bdbdc9d7b0.tar.xz gnupg2-e18ddb60ff3f7e7a8f3a6e22153823bdbdc9d7b0.zip | |
From stable branch
* gpgkeys_ldap.c (send_key): Removed non-constant initializers.
Diffstat (limited to 'keyserver')
| -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 0ac86dce0..c0a3acb97 100644 --- a/keyserver/ChangeLog +++ b/keyserver/ChangeLog @@ -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, 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) |