aboutsummaryrefslogtreecommitdiffstats
path: root/keyserver
diff options
context:
space:
mode:
Diffstat (limited to 'keyserver')
-rw-r--r--keyserver/curl-shim.h4
-rw-r--r--keyserver/gpgkeys_curl.c4
-rw-r--r--keyserver/gpgkeys_finger.c2
-rw-r--r--keyserver/gpgkeys_hkp.c8
-rw-r--r--keyserver/gpgkeys_kdns.c40
-rw-r--r--keyserver/gpgkeys_ldap.c10
6 files changed, 34 insertions, 34 deletions
diff --git a/keyserver/curl-shim.h b/keyserver/curl-shim.h
index e37d81675..0a11e7cd9 100644
--- a/keyserver/curl-shim.h
+++ b/keyserver/curl-shim.h
@@ -82,7 +82,7 @@ typedef struct
typedef struct
{
const char **protocols;
-} curl_version_info_data;
+} curl_version_info_data;
#define CURL_ERROR_SIZE 256
#define CURL_GLOBAL_DEFAULT 0
@@ -96,7 +96,7 @@ CURLcode curl_easy_perform(CURL *curl);
void curl_easy_cleanup(CURL *curl);
char *curl_escape(char *str,int len);
#define curl_free(x) free(x)
-#define curl_version() "GnuPG curl-shim"
+#define curl_version() GNUPG_NAME" curl-shim"
curl_version_info_data *curl_version_info(int type);
struct curl_slist
diff --git a/keyserver/gpgkeys_curl.c b/keyserver/gpgkeys_curl.c
index 7a4ec52c6..fc4c6f38f 100644
--- a/keyserver/gpgkeys_curl.c
+++ b/keyserver/gpgkeys_curl.c
@@ -99,7 +99,7 @@ get_key(char *getkey)
return curl_err_to_gpg_err(res);
}
-static void
+static void
show_help (FILE *fp)
{
fprintf (fp,"-h, --help\thelp\n");
@@ -124,7 +124,7 @@ main(int argc,char *argv[])
/* Kludge to implement standard GNU options. */
if (argc > 1 && !strcmp (argv[1], "--version"))
{
- printf ("gpgkeys_curl (GnuPG) %s\n", VERSION);
+ printf ("gpgkeys_curl (%s) %s\n", GNUPG_NAME, VERSION);
printf ("Uses: %s\n", curl_version());
return 0;
}
diff --git a/keyserver/gpgkeys_finger.c b/keyserver/gpgkeys_finger.c
index b3bbf347a..673e95643 100644
--- a/keyserver/gpgkeys_finger.c
+++ b/keyserver/gpgkeys_finger.c
@@ -337,7 +337,7 @@ main(int argc,char *argv[])
/* Kludge to implement standard GNU options. */
if (argc > 1 && !strcmp (argv[1], "--version"))
{
- fputs ("gpgkeys_finger (GnuPG) " VERSION"\n", stdout);
+ fputs ("gpgkeys_finger ("GNUPG_NAME") " VERSION"\n", stdout);
return 0;
}
else if (argc > 1 && !strcmp (argv[1], "--help"))
diff --git a/keyserver/gpgkeys_hkp.c b/keyserver/gpgkeys_hkp.c
index d96199ff7..6ecc8bb5a 100644
--- a/keyserver/gpgkeys_hkp.c
+++ b/keyserver/gpgkeys_hkp.c
@@ -354,7 +354,7 @@ get_name(const char *getkey)
ret=KEYSERVER_NO_MEMORY;
goto fail;
}
-
+
fprintf(output,"NAME %s BEGIN\n",getkey);
if(opt->verbose>2)
@@ -546,7 +546,7 @@ srv_replace(const char *srvtag)
}
#endif
-static void
+static void
show_help (FILE *fp)
{
fprintf (fp,"-h, --help\thelp\n");
@@ -570,7 +570,7 @@ main(int argc,char *argv[])
/* Kludge to implement standard GNU options. */
if (argc > 1 && !strcmp (argv[1], "--version"))
{
- printf ("gpgkeys_hkp (GnuPG) %s\n", VERSION);
+ printf ("gpgkeys_hkp (%s) %s\n", GNUPG_NAME, VERSION);
printf ("Uses: %s\n", curl_version());
return 0;
}
@@ -743,7 +743,7 @@ main(int argc,char *argv[])
/* We're using libcurl, so fake SRV support via our wrapper.
This isn't as good as true SRV support, as we do not try all
possible targets at one particular level and work our way
- down the list, but it's better than nothing. */
+ down the list, but it's better than nothing. */
srv_replace(srvtag);
#else
/* We're using our internal curl shim, so we can use its (true)
diff --git a/keyserver/gpgkeys_kdns.c b/keyserver/gpgkeys_kdns.c
index 12161d16a..14651f993 100644
--- a/keyserver/gpgkeys_kdns.c
+++ b/keyserver/gpgkeys_kdns.c
@@ -115,9 +115,9 @@ get_key (adns_state adns_ctx, char *address)
ret = KEYSERVER_KEY_NOT_FOUND;
goto leave;
}
- if (answer->status != adns_s_ok)
+ if (answer->status != adns_s_ok)
{
- fprintf (console, PGM": DNS query returned: %s (%s)\n",
+ fprintf (console, PGM": DNS query returned: %s (%s)\n",
adns_strerror (answer->status),
adns_errabbrev (answer->status));
ret = KEYSERVER_KEY_NOT_FOUND;
@@ -141,7 +141,7 @@ get_key (adns_state adns_ctx, char *address)
}
if ( datalen < 5 )
{
- fprintf (console, PGM": error: truncated CERT record\n");
+ fprintf (console, PGM": error: truncated CERT record\n");
ret = KEYSERVER_KEY_NOT_FOUND;
goto leave;
}
@@ -155,7 +155,7 @@ get_key (adns_state adns_ctx, char *address)
if ( datalen < 11 )
{
/* Gpg checks for a minium length of 11, thus we do the same. */
- fprintf (console, PGM": error: OpenPGP data to short\n");
+ fprintf (console, PGM": error: OpenPGP data to short\n");
ret = KEYSERVER_KEY_NOT_FOUND;
goto leave;
}
@@ -166,11 +166,11 @@ get_key (adns_state adns_ctx, char *address)
break;
default:
- fprintf (console, PGM": CERT type %d ignored\n", (data[0] <<8|data[1]));
+ fprintf (console, PGM": CERT type %d ignored\n", (data[0] <<8|data[1]));
ret = KEYSERVER_KEY_NOT_FOUND;
goto leave;
}
-
+
ret = 0; /* All fine. */
leave:
@@ -178,17 +178,17 @@ get_key (adns_state adns_ctx, char *address)
fprintf (output, "\nNAME %s FAILED %d\n", address, ret);
else
fprintf (output, "\nNAME %s END\n", address);
- adns_free (answer);
+ adns_free (answer);
xfree (name);
return ret;
}
/* Print some help. */
-static void
+static void
show_help (FILE *fp)
{
- fputs (PGM" (GnuPG) " VERSION"\n\n", fp);
+ fputs (PGM" ("GNUPG_NAME") " VERSION"\n\n", fp);
fputs (" -h\thelp\n"
" -V\tversion\n"
" -o\toutput to this file\n"
@@ -233,7 +233,7 @@ main (int argc, char *argv[])
/* Kludge to implement standard GNU options. */
if (argc > 1 && !strcmp (argv[1], "--version"))
{
- fputs (PGM" (GnuPG) " VERSION"\n", stdout);
+ fputs (PGM" ("GNUPG_NAME") " VERSION"\n", stdout);
return 0;
}
else if (argc > 1 && !strcmp (argv[1], "--help"))
@@ -283,7 +283,7 @@ main (int argc, char *argv[])
if (!output)
output = stdout;
-
+
opt = init_ks_options();
if(!opt)
return KEYSERVER_NO_MEMORY;
@@ -292,10 +292,10 @@ main (int argc, char *argv[])
while ( fgets(line,MAX_LINE,input) )
{
int err;
-
+
if(line[0]=='\n')
break;
-
+
err = parse_ks_options (line, opt);
if (err > 0)
{
@@ -326,7 +326,7 @@ main (int argc, char *argv[])
if (p)
{
*p++ = 0;
- do
+ do
{
pend = strchr (p, '&');
if (pend)
@@ -371,7 +371,7 @@ main (int argc, char *argv[])
strerror (errno));
goto leave;
}
-
+
if (opt->action == KS_GETNAME)
{
while ( fgets (line,MAX_LINE,input) )
@@ -379,11 +379,11 @@ main (int argc, char *argv[])
if (line[0]=='\n' || !line[0] )
break;
line[strlen(line)-1] = 0; /* Trim the trailing LF. */
-
+
akey = xtrymalloc (sizeof *akey);
if (!akey)
{
- fprintf (console,
+ fprintf (console,
PGM": out of memory while building key list\n");
ret = KEYSERVER_NO_MEMORY;
goto leave;
@@ -402,7 +402,7 @@ main (int argc, char *argv[])
"key retrieval by name\n");
goto leave;
}
-
+
/* Send the response */
fprintf (output, "VERSION %d\n", KEYSERVER_PROTO_VERSION);
fprintf (output, "PROGRAM %s\n\n", VERSION);
@@ -413,13 +413,13 @@ main (int argc, char *argv[])
fprintf (console, "User:\t\t%s\n", opt->opaque);
fprintf (console, "Command:\tGET\n");
}
-
+
for (akey = keylist; akey; akey = akey->next)
{
set_timeout (opt->timeout);
if ( get_key (adns_ctx, akey->str) )
failed++;
- }
+ }
if (!failed)
ret = KEYSERVER_OK;
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"))
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-20 20:00:51 +0000