diff options
| author | Werner Koch <[email protected]> | 2013-11-18 13:09:47 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2013-11-18 13:09:47 +0000 |
| commit | cc9a0b69b698ba436eaf777e5020532845b56236 (patch) | |
| tree | cb2274c3d97fffa7020cb1e5a56373935ee094b2 /keyserver/gpgkeys_ldap.c | |
| parent | Add strusage macro replacement feature. (diff) | |
| download | gnupg-cc9a0b69b698ba436eaf777e5020532845b56236.tar.gz gnupg-cc9a0b69b698ba436eaf777e5020532845b56236.zip | |
Make use of the *_NAME etc macros.
Replace hardwired strings at many places with new macros from config.h
and use the new strusage macro replacement feature.
* common/asshelp.c (lock_spawning) [W32]: Change the names of the spawn
sentinels.
* agent/command.c (cmd_import_key): Use asprintf to create the prompt.
Diffstat (limited to '')
| -rw-r--r-- | keyserver/gpgkeys_ldap.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/keyserver/gpgkeys_ldap.c b/keyserver/gpgkeys_ldap.c index 21ad8f702..f24a5719b 100644 --- a/keyserver/gpgkeys_ldap.c +++ b/keyserver/gpgkeys_ldap.c @@ -455,7 +455,7 @@ build_attrs(LDAPMod ***modlist,char *line) case 'R': revoked=1; break; - + case 'd': case 'D': disabled=1; @@ -1037,7 +1037,7 @@ get_key(char *getkey) else { /* short key id */ - + sprintf(search,"(pgpkeyid=%.8s)",getkey); } @@ -1767,12 +1767,12 @@ find_basekeyspacedn(void) } ldap_msgfree(si_res); - } + } return LDAP_SUCCESS; } -static void +static void show_help (FILE *fp) { fprintf (fp,"-h, --help\thelp\n"); @@ -1794,7 +1794,7 @@ main(int argc,char *argv[]) /* Kludge to implement standard GNU options. */ if (argc > 1 && !strcmp (argv[1], "--version")) { - fputs ("gpgkeys_ldap (GnuPG) " VERSION"\n", stdout); + fputs ("gpgkeys_ldap ("GNUPG_NAME") " VERSION"\n", stdout); return 0; } else if (argc > 1 && !strcmp (argv[1], "--help")) |