security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-02 22:46:30 +02:00
Code Activity

Change all quotes in strings and comments to the new GNU standard.

Browse source 
The asymmetric quotes used by GNU in the past (`...') don't render
nicely on modern systems.  We now use two \x27 characters ('...').

The proper solution would be to use the correct Unicode symmetric
quotes here.  However this has the disadvantage that the system
requires Unicode support.  We don't want that today.  If Unicode is
available a generated po file can be used to output proper quotes.  A
simple sed script like the one used for en@quote is sufficient to
change them.

The changes have been done by applying

  sed -i "s/\`\([^'\`]*\)'/'\1'/g"

to most files and fixing obvious problems by hand.  The msgid strings in
the po files were fixed with a similar command.
This commit is contained in:
Werner Koch 2012-06-05 19:29:22 +02:00
parent fc00d3fcb2
commit 096e7457ec
175 changed files with 4857 additions and 4869 deletions
Download patch file Download diff file Expand all files Collapse all files

2
dirmngr/cdblib.c
View file

@ -7,7 +7,7 @@
* inclusion into Dirmngr. By Werner Koch <wk@gnupg.org> 2003-12-12.
*/
/* A cdb database is a single file used to map `keys' to `values',
/* A cdb database is a single file used to map 'keys' to 'values',
having records of (key,value) pairs. File consists of 3 parts: toc
(table of contents), data and index (hash tables).

16
dirmngr/certcache.c
View file

@ -349,7 +349,7 @@ load_certs_from_dir (const char *dirname, int are_trusted)
if (!dir)
{
if (opt.system_daemon)
log_info (_("can't access directory `%s': %s\n"),
log_info (_("can't access directory '%s': %s\n"),
dirname, strerror (errno));
return 0; /* We do not consider this a severe error. */
}
@ -368,7 +368,7 @@ load_certs_from_dir (const char *dirname, int are_trusted)
fp = es_fopen (fname, "rb");
if (!fp)
{
log_error (_("can't open `%s': %s\n"),
log_error (_("can't open '%s': %s\n"),
fname, strerror (errno));
continue;
}
@ -387,7 +387,7 @@ load_certs_from_dir (const char *dirname, int are_trusted)
es_fclose (fp);
if (err)
{
log_error (_("can't parse certificate `%s': %s\n"),
log_error (_("can't parse certificate '%s': %s\n"),
fname, gpg_strerror (err));
ksba_cert_release (cert);
continue;
@ -395,13 +395,13 @@ load_certs_from_dir (const char *dirname, int are_trusted)
err = put_cert (cert, 1, are_trusted, NULL);
if (gpg_err_code (err) == GPG_ERR_DUP_VALUE)
log_info (_("certificate `%s' already cached\n"), fname);
log_info (_("certificate '%s' already cached\n"), fname);
else if (!err)
{
if (are_trusted)
log_info (_("trusted certificate `%s' loaded\n"), fname);
log_info (_("trusted certificate '%s' loaded\n"), fname);
else
log_info (_("certificate `%s' loaded\n"), fname);
log_info (_("certificate '%s' loaded\n"), fname);
if (opt.verbose)
{
p = get_fingerprint_hexstring_colon (cert);
@ -413,7 +413,7 @@ load_certs_from_dir (const char *dirname, int are_trusted)
}
}
else
log_error (_("error loading certificate `%s': %s\n"),
log_error (_("error loading certificate '%s': %s\n"),
fname, gpg_strerror (err));
ksba_cert_release (cert);
}
@ -593,7 +593,7 @@ get_cert_byhexfpr (const char *string)
}
if (i!=20 || *s)
{
log_error (_("invalid SHA1 fingerprint string `%s'\n"), string);
log_error (_("invalid SHA1 fingerprint string '%s'\n"), string);
return NULL;
}

96
dirmngr/crlcache.c
View file

@ -211,11 +211,11 @@ create_directory_if_needed (const char *name)
dir = opendir (fname);
if (!dir)
{
log_info (_("creating directory `%s'\n"), fname);
log_info (_("creating directory '%s'\n"), fname);
if (mkdir (fname, S_IRUSR|S_IWUSR|S_IXUSR) )
{
int save_errno = errno;
log_error (_("error creating directory `%s': %s\n"),
log_error (_("error creating directory '%s': %s\n"),
fname, strerror (errno));
xfree (fname);
gpg_err_set_errno (save_errno);
@ -243,7 +243,7 @@ cleanup_cache_dir (int force)
{ /* Very minor sanity checks. */
if (!strcmp (dname, "~/") || !strcmp (dname, "/" ))
{
log_error (_("ignoring database dir `%s'\n"), dname);
log_error (_("ignoring database dir '%s'\n"), dname);
xfree (dname);
return -1;
}
@ -252,7 +252,7 @@ cleanup_cache_dir (int force)
dir = opendir (dname);
if (!dir)
{
log_error (_("error reading directory `%s': %s\n"),
log_error (_("error reading directory '%s': %s\n"),
dname, strerror (errno));
xfree (dname);
return -1;
@ -273,16 +273,16 @@ cleanup_cache_dir (int force)
if (okay)
{
log_info (_("removing cache file `%s'\n"), cdbname);
log_info (_("removing cache file '%s'\n"), cdbname);
if (gnupg_remove (cdbname))
{
log_error ("failed to remove `%s': %s\n",
log_error ("failed to remove '%s': %s\n",
cdbname, strerror (errno));
problem = -1;
}
}
else
log_info (_("not removing file `%s'\n"), cdbname);
log_info (_("not removing file '%s'\n"), cdbname);
xfree (cdbname);
}
}
@ -409,7 +409,7 @@ open_dir_file (const char *fname)
fp = es_fopen (fname, "r");
if (!fp)
{
log_error (_("failed to open cache dir file `%s': %s\n"),
log_error (_("failed to open cache dir file '%s': %s\n"),
fname, strerror (errno));
/* Make sure that the directory exists, try to create if otherwise. */
@ -419,31 +419,31 @@ open_dir_file (const char *fname)
fp = es_fopen (fname, "w");
if (!fp)
{
log_error (_("error creating new cache dir file `%s': %s\n"),
log_error (_("error creating new cache dir file '%s': %s\n"),
fname, strerror (errno));
return NULL;
}
es_fprintf (fp, "v:%d:\n", DBDIRVERSION);
if (es_ferror (fp))
{
log_error (_("error writing new cache dir file `%s': %s\n"),
log_error (_("error writing new cache dir file '%s': %s\n"),
fname, strerror (errno));
es_fclose (fp);
return NULL;
}
if (es_fclose (fp))
{
log_error (_("error closing new cache dir file `%s': %s\n"),
log_error (_("error closing new cache dir file '%s': %s\n"),
fname, strerror (errno));
return NULL;
}
log_info (_("new cache dir file `%s' created\n"), fname);
log_info (_("new cache dir file '%s' created\n"), fname);
fp = es_fopen (fname, "r");
if (!fp)
{
log_error (_("failed to re-open cache dir file `%s': %s\n"),
log_error (_("failed to re-open cache dir file '%s': %s\n"),
fname, strerror (errno));
return NULL;
}
@ -471,7 +471,7 @@ check_dir_version (estream_t *fpadr, const char *fname,
break;
else if (*line != '#')
{
log_error (_("first record of `%s' is not the version\n"), fname);
log_error (_("first record of '%s' is not the version\n"), fname);
xfree (line);
return gpg_error (GPG_ERR_CONFIGURATION);
}
@ -612,14 +612,14 @@ open_dir (crl_cache_t *r_cache)
default:
if (*p)
log_info (_("extra field detected in crl record of "
"`%s' line %u\n"), fname, lineno);
"'%s' line %u\n"), fname, lineno);
break;
}
}
if (!entry->issuer_hash)
{
log_info (_("invalid line detected in `%s' line %u\n"),
log_info (_("invalid line detected in '%s' line %u\n"),
fname, lineno);
xfree (entry);
entry = NULL;
@ -628,7 +628,7 @@ open_dir (crl_cache_t *r_cache)
{
/* Fixme: The duplicate checking used is not very
effective for large numbers of issuers. */
log_info (_("duplicate entry detected in `%s' line %u\n"),
log_info (_("duplicate entry detected in '%s' line %u\n"),
fname, lineno);
xfree (entry);
entry = NULL;
@ -643,7 +643,7 @@ open_dir (crl_cache_t *r_cache)
else if (*line == '#')
;
else
log_info (_("unsupported record type in `%s' line %u skipped\n"),
log_info (_("unsupported record type in '%s' line %u skipped\n"),
fname, lineno);
if (line)
@ -652,12 +652,12 @@ open_dir (crl_cache_t *r_cache)
if (lineerr)
{
err = lineerr;
log_error (_("error reading `%s': %s\n"), fname, gpg_strerror (err));
log_error (_("error reading '%s': %s\n"), fname, gpg_strerror (err));
goto leave;
}
if (es_ferror (fp))
{
log_error (_("error reading `%s': %s\n"), fname, strerror (errno));
log_error (_("error reading '%s': %s\n"), fname, strerror (errno));
err = gpg_error (GPG_ERR_CONFIGURATION);
goto leave;
}
@ -669,26 +669,26 @@ open_dir (crl_cache_t *r_cache)
if (strlen (entry->issuer_hash) != 40)
{
anyerr++;
log_error (_("invalid issuer hash in `%s' line %u\n"),
log_error (_("invalid issuer hash in '%s' line %u\n"),
fname, entry->lineno);
}
else if ( !*entry->issuer )
{
anyerr++;
log_error (_("no issuer DN in `%s' line %u\n"),
log_error (_("no issuer DN in '%s' line %u\n"),
fname, entry->lineno);
}
else if ( check_isotime (entry->this_update)
|| check_isotime (entry->next_update))
{
anyerr++;
log_error (_("invalid timestamp in `%s' line %u\n"),
log_error (_("invalid timestamp in '%s' line %u\n"),
fname, entry->lineno);
}
/* Checks not leading to an immediate fail. */
if (strlen (entry->dbfile_hash) != 32)
log_info (_("WARNING: invalid cache file hash in `%s' line %u\n"),
log_info (_("WARNING: invalid cache file hash in '%s' line %u\n"),
fname, entry->lineno);
}
@ -791,7 +791,7 @@ update_dir (crl_cache_t cache)
if (!fp)
{
err = gpg_error_from_errno (errno);
log_error (_("failed to open cache dir file `%s': %s\n"),
log_error (_("failed to open cache dir file '%s': %s\n"),
fname, strerror (errno));
goto leave;
}
@ -823,7 +823,7 @@ update_dir (crl_cache_t cache)
if (!tmpbuf)
{
err = gpg_error_from_errno (errno);
log_error (_("failed to create temporary cache dir file `%s': %s\n"),
log_error (_("failed to create temporary cache dir file '%s': %s\n"),
tmpfname, strerror (errno));
goto leave;
}
@ -837,7 +837,7 @@ update_dir (crl_cache_t cache)
if (!fpout)
{
err = gpg_error_from_errno (errno);
log_error (_("failed to create temporary cache dir file `%s': %s\n"),
log_error (_("failed to create temporary cache dir file '%s': %s\n"),
tmpfname, strerror (errno));
goto leave;
}
@ -911,18 +911,18 @@ update_dir (crl_cache_t cache)
if (lineerr)
{
err = lineerr;
log_error (_("error reading `%s': %s\n"), fname, gpg_strerror (err));
log_error (_("error reading '%s': %s\n"), fname, gpg_strerror (err));
goto leave;
}
if (es_ferror (fp))
{
err = gpg_error_from_errno (errno);
log_error (_("error reading `%s': %s\n"), fname, strerror (errno));
log_error (_("error reading '%s': %s\n"), fname, strerror (errno));
}
if (es_ferror (fpout))
{
err = gpg_error_from_errno (errno);
log_error (_("error writing `%s': %s\n"), tmpfname, strerror (errno));
log_error (_("error writing '%s': %s\n"), tmpfname, strerror (errno));
}
if (err)
goto leave;
@ -933,7 +933,7 @@ update_dir (crl_cache_t cache)
if (es_fclose (fpout))
{
err = gpg_error_from_errno (errno);
log_error (_("error closing `%s': %s\n"), tmpfname, strerror (errno));
log_error (_("error closing '%s': %s\n"), tmpfname, strerror (errno));
goto leave;
}
fpout = NULL;
@ -945,7 +945,7 @@ update_dir (crl_cache_t cache)
if (rename (tmpfname, fname))
{
err = gpg_error_from_errno (errno);
log_error (_("error renaming `%s' to `%s': %s\n"),
log_error (_("error renaming '%s' to '%s': %s\n"),
tmpfname, fname, strerror (errno));
goto leave;
}
@ -999,7 +999,7 @@ hash_dbfile (const char *fname, unsigned char *md5buffer)
fp = buffer? es_fopen (fname, "rb") : NULL;
if (!fp)
{
log_error (_("can't hash `%s': %s\n"), fname, strerror (errno));
log_error (_("can't hash '%s': %s\n"), fname, strerror (errno));
xfree (buffer);
return -1;
}
@ -1023,7 +1023,7 @@ hash_dbfile (const char *fname, unsigned char *md5buffer)
n = es_fread (buffer, 1, 65536, fp);
if (n < 65536 && es_ferror (fp))
{
log_error (_("error hashing `%s': %s\n"), fname, strerror (errno));
log_error (_("error hashing '%s': %s\n"), fname, strerror (errno));
xfree (buffer);
es_fclose (fp);
gcry_md_close (md5);
@ -1051,7 +1051,7 @@ check_dbfile (const char *fname, const char *md5hexvalue)
if (strlen (md5hexvalue) != 32)
{
log_error (_("invalid formatted checksum for `%s'\n"), fname);
log_error (_("invalid formatted checksum for '%s'\n"), fname);
return -1;
}
unhexify (buffer1, md5hexvalue);
@ -1122,7 +1122,7 @@ lock_db_file (crl_cache_t cache, crl_cache_entry_t entry)
fname = make_db_file_name (entry->issuer_hash);
if (opt.verbose)
log_info (_("opening cache file `%s'\n"), fname );
log_info (_("opening cache file '%s'\n"), fname );
if (!entry->dbfile_checked)
{
@ -1141,7 +1141,7 @@ lock_db_file (crl_cache_t cache, crl_cache_entry_t entry)
fd = open (fname, O_RDONLY);
if (fd == -1)
{
log_error (_("error opening cache file `%s': %s\n"),
log_error (_("error opening cache file '%s': %s\n"),
fname, strerror (errno));
xfree (entry->cdb);
entry->cdb = NULL;
@ -1150,7 +1150,7 @@ lock_db_file (crl_cache_t cache, crl_cache_entry_t entry)
}
if (cdb_init (entry->cdb, fd))
{
log_error (_("error initializing cache file `%s' for reading: %s\n"),
log_error (_("error initializing cache file '%s' for reading: %s\n"),
fname, strerror (errno));
xfree (entry->cdb);
entry->cdb = NULL;
@ -1536,7 +1536,7 @@ start_sig_check (ksba_crl_t crl, gcry_md_hd_t *md, int *algo)
*algo = gcry_md_map_name (algoid);
if (!*algo)
{
log_error (_("unknown hash algorithm `%s'\n"), algoid? algoid:"?");
log_error (_("unknown hash algorithm '%s'\n"), algoid? algoid:"?");
return gpg_error (GPG_ERR_DIGEST_ALGO);
}
@ -2035,11 +2035,11 @@ crl_cache_insert (ctrl_t ctrl, const char *url, ksba_reader_t reader)
fname = make_filename (opt.homedir_cache, DBDIR_D, tmpfname, NULL);
xfree (tmpfname);
if (!gnupg_remove (fname))
log_info (_("removed stale temporary cache file `%s'\n"), fname);
log_info (_("removed stale temporary cache file '%s'\n"), fname);
else if (errno != ENOENT)
{
err = gpg_error_from_syserror ();
log_error (_("problem removing stale temporary cache file `%s': %s\n"),
log_error (_("problem removing stale temporary cache file '%s': %s\n"),
fname, gpg_strerror (err));
goto leave;
}
@ -2049,7 +2049,7 @@ crl_cache_insert (ctrl_t ctrl, const char *url, ksba_reader_t reader)
if (fd_cdb == -1)
{
err = gpg_error_from_errno (errno);
log_error (_("error creating temporary cache file `%s': %s\n"),
log_error (_("error creating temporary cache file '%s': %s\n"),
fname, strerror (errno));
goto leave;
}
@ -2069,14 +2069,14 @@ crl_cache_insert (ctrl_t ctrl, const char *url, ksba_reader_t reader)
if (cdb_make_finish (&cdb))
{
err = gpg_error_from_errno (errno);
log_error (_("error finishing temporary cache file `%s': %s\n"),
log_error (_("error finishing temporary cache file '%s': %s\n"),
fname, strerror (errno));
goto leave;
}
if (close (fd_cdb))
{
err = gpg_error_from_errno (errno);
log_error (_("error closing temporary cache file `%s': %s\n"),
log_error (_("error closing temporary cache file '%s': %s\n"),
fname, strerror (errno));
goto leave;
}
@ -2182,7 +2182,7 @@ crl_cache_insert (ctrl_t ctrl, const char *url, ksba_reader_t reader)
/* Rename the temporary DB to the real name. */
newfname = make_db_file_name (entry->issuer_hash);
if (opt.verbose)
log_info (_("creating cache file `%s'\n"), newfname);
log_info (_("creating cache file '%s'\n"), newfname);
/* Just in case close unused matching files. Actually we need this
only under Windows but saving file descriptors is never bad. */
@ -2214,7 +2214,7 @@ crl_cache_insert (ctrl_t ctrl, const char *url, ksba_reader_t reader)
if (rename (fname, newfname))
{
err = gpg_error_from_syserror ();
log_error (_("problem renaming `%s' to `%s': %s\n"),
log_error (_("problem renaming '%s' to '%s': %s\n"),
fname, newfname, gpg_strerror (err));
goto leave;
}
@ -2408,7 +2408,7 @@ crl_cache_load (ctrl_t ctrl, const char *filename)
if (!fp)
{
err = gpg_error_from_errno (errno);
log_error (_("can't open `%s': %s\n"), filename, strerror (errno));
log_error (_("can't open '%s': %s\n"), filename, strerror (errno));
return err;
}
@ -2488,7 +2488,7 @@ crl_cache_reload_crl (ctrl_t ctrl, ksba_cert_t cert)
any_dist_point = 1;
if (opt.verbose)
log_info ("fetching CRL from `%s'\n", distpoint_uri);
log_info ("fetching CRL from '%s'\n", distpoint_uri);
err = crl_fetch (ctrl, distpoint_uri, &reader);
if (err)
{

6
dirmngr/crlfetch.c
View file

@ -242,7 +242,7 @@ crl_fetch (ctrl_t ctrl, const char *url, ksba_reader_t *reader)
{
const char *s = http_get_header (hd, "Location");
log_info (_("URL `%s' redirected to `%s' (%u)\n"),
log_info (_("URL '%s' redirected to '%s' (%u)\n"),
url, s?s:"[none]", http_get_status_code (hd));
if (s && *s && redirects_left-- )
{
@ -267,12 +267,12 @@ crl_fetch (ctrl_t ctrl, const char *url, ksba_reader_t *reader)
break;
case 99999: /* Made up status code for error reporting. */
log_error (_("error retrieving `%s': %s\n"),
log_error (_("error retrieving '%s': %s\n"),
url, gpg_strerror (err));
break;
default:
log_error (_("error retrieving `%s': http status %u\n"),
log_error (_("error retrieving '%s': http status %u\n"),
url, http_get_status_code (hd));
err = gpg_error (GPG_ERR_NO_DATA);
http_close (hd, 0);

12
dirmngr/dirmngr-client.c
View file

@ -272,7 +272,7 @@ main (int argc, char **argv )
{
err = read_certificate (*argv, &certbuf, &certbuflen);
if (err)
log_error (_("error reading certificate from `%s': %s\n"),
log_error (_("error reading certificate from '%s': %s\n"),
*argv, gpg_strerror (err));
}
else
@ -327,7 +327,7 @@ main (int argc, char **argv )
err = do_loadcrl (ctx, *argv);
if (err)
{
log_error (_("loading CRL `%s' failed: %s\n"),
log_error (_("loading CRL '%s' failed: %s\n"),
*argv, gpg_strerror (err));
last_err = err;
}
@ -408,7 +408,7 @@ status_cb (void *opaque, const char *line)
(void)opaque;
if (opt.verbose > 2)
log_info (_("got status: `%s'\n"), line);
log_info (_("got status: '%s'\n"), line);
return 0;
}
@ -791,7 +791,7 @@ inq_cert (void *opaque, const char *line)
}
else
{
log_info (_("unsupported inquiry `%s'\n"), line);
log_info (_("unsupported inquiry '%s'\n"), line);
err = gpg_error (GPG_ERR_ASS_UNKNOWN_INQUIRE);
/* Note that this error will let assuan_transact terminate
immediately instead of return the error to the caller. It is
@ -884,7 +884,7 @@ do_loadcrl (assuan_context_t ctx, const char *filename)
fname = canonicalize_file_name (filename);
if (!fname)
{
log_error ("error canonicalizing `%s': %s\n",
log_error ("error canonicalizing '%s': %s\n",
filename, strerror (errno));
return gpg_error (GPG_ERR_GENERAL);
}
@ -938,7 +938,7 @@ do_lookup (assuan_context_t ctx, const char *pattern)
struct b64state state;
if (opt.verbose)
log_info (_("looking up `%s'\n"), pattern);
log_info (_("looking up '%s'\n"), pattern);
err = b64enc_start (&state, stdout, NULL);
if (err)

28
dirmngr/dirmngr.c
View file

@ -363,7 +363,7 @@ set_debug (void)
}
else
{
log_error (_("invalid debug-level `%s' given\n"), debug_level);
log_error (_("invalid debug-level '%s' given\n"), debug_level);
log_info (_("valid debug levels are: %s\n"),
"none, basic, advanced, expert, guru");
opt.debug = 0; /* Reset debugging, so that prior debug
@ -736,12 +736,12 @@ main (int argc, char **argv)
if (default_config)
{
if( parse_debug )
log_info (_("NOTE: no default option file `%s'\n"),
log_info (_("NOTE: no default option file '%s'\n"),
configname );
}
else
{
log_error (_("option file `%s': %s\n"),
log_error (_("option file '%s': %s\n"),
configname, strerror(errno) );
exit(2);
}
@ -749,7 +749,7 @@ main (int argc, char **argv)
configname = NULL;
}
if (parse_debug && configname )
log_info (_("reading options from `%s'\n"), configname );
log_info (_("reading options from '%s'\n"), configname );
default_config = 0;
}
@ -854,7 +854,7 @@ main (int argc, char **argv)
for (i=0; i < argc; i++)
if (argv[i][0] == '-' && argv[i][1] == '-')
log_info (_("NOTE: `%s' is not considered an option\n"), argv[i]);
log_info (_("NOTE: '%s' is not considered an option\n"), argv[i]);
}
if (!access ("/etc/dirmngr", F_OK) && !strncmp (opt.homedir, "/etc/", 5))
@ -862,7 +862,7 @@ main (int argc, char **argv)
("NOTE: DirMngr is now a proper part of GnuPG. The configuration and"
" other directory names changed. Please check that no other version"
" of dirmngr is still installed. To disable this warning, remove the"
" directory `/etc/dirmngr'.\n");
" directory '/etc/dirmngr'.\n");
if (gnupg_faked_time_p ())
{
@ -993,7 +993,7 @@ main (int argc, char **argv)
log_error (_("error getting nonce for the socket\n"));
if (rc == -1)
{
log_error (_("error binding socket to `%s': %s\n"),
log_error (_("error binding socket to '%s': %s\n"),
serv_addr.sun_path, gpg_strerror (gpg_error_from_errno (errno)));
assuan_sock_close (fd);
dirmngr_exit (1);
@ -1008,7 +1008,7 @@ main (int argc, char **argv)
}
if (opt.verbose)
log_info (_("listening on socket `%s'\n"), socket_name );
log_info (_("listening on socket '%s'\n"), socket_name );
es_fflush (NULL);
@ -1159,13 +1159,13 @@ main (int argc, char **argv)
crl_cache_init ();
rc = crl_fetch (&ctrlbuf, argv[0], &reader);
if (rc)
log_error (_("fetching CRL from `%s' failed: %s\n"),
log_error (_("fetching CRL from '%s' failed: %s\n"),
argv[0], gpg_strerror (rc));
else
{
rc = crl_cache_insert (&ctrlbuf, argv[0], reader);
if (rc)
log_error (_("processing CRL from `%s' failed: %s\n"),
log_error (_("processing CRL from '%s' failed: %s\n"),
argv[0], gpg_strerror (rc));
crl_close_reader (reader);
}
@ -1369,7 +1369,7 @@ parse_ldapserver_file (const char* filename)
fp = es_fopen (filename, "r");
if (!fp)
{
log_error (_("error opening `%s': %s\n"), filename, strerror (errno));
log_error (_("error opening '%s': %s\n"), filename, strerror (errno));
return NULL;
}
@ -1407,7 +1407,7 @@ parse_ldapserver_file (const char* filename)
}
if (es_ferror (fp))
log_error (_("error reading `%s': %s\n"), filename, strerror (errno));
log_error (_("error reading '%s': %s\n"), filename, strerror (errno));
es_fclose (fp);
return serverstart;
@ -1461,7 +1461,7 @@ parse_ocsp_signer (const char *string)
if (!fp)
{
err = gpg_error_from_syserror ();
log_error (_("can't open `%s': %s\n"), fname, gpg_strerror (err));
log_error (_("can't open '%s': %s\n"), fname, gpg_strerror (err));
xfree (fname);
return NULL;
}
@ -1567,7 +1567,7 @@ reread_configuration (void)
fp = fopen (opt.config_filename, "r");
if (!fp)
{
log_error (_("option file `%s': %s\n"),
log_error (_("option file '%s': %s\n"),
opt.config_filename, strerror(errno) );
return;
}

40
dirmngr/dirmngr_ldap.c
View file

@ -401,7 +401,7 @@ print_ldap_entries (my_opt_t myopt, LDAP *ld, LDAPMessage *msg, char *want_attr)
char *attr;
if (myopt->verbose > 1)
log_info (_("scanning result for attribute `%s'\n"),
log_info (_("scanning result for attribute '%s'\n"),
want_attr? want_attr : "[all]");
if (myopt->multi)
@ -425,7 +425,7 @@ print_ldap_entries (my_opt_t myopt, LDAP *ld, LDAPMessage *msg, char *want_attr)
int idx;
if (myopt->verbose > 1)
log_info (_(" available attribute `%s'\n"), attr);
log_info (_(" available attribute '%s'\n"), attr);
set_timeout (myopt);
@ -463,14 +463,14 @@ print_ldap_entries (my_opt_t myopt, LDAP *ld, LDAPMessage *msg, char *want_attr)
if (!values)
{
if (myopt->verbose)
log_info (_("attribute `%s' not found\n"), attr);
log_info (_("attribute '%s' not found\n"), attr);
my_ldap_free_attr (attr);
continue;
}
if (myopt->verbose)
{
log_info (_("found attribute `%s'\n"), attr);
log_info (_("found attribute '%s'\n"), attr);
if (myopt->verbose > 1)
for (idx=0; values[idx]; idx++)
log_info (" length[%d]=%d\n",
@ -579,37 +579,37 @@ fetch_ldap (my_opt_t myopt, const char *url, const LDAPURLDesc *ludp)
if (myopt->verbose)
{
log_info (_("processing url `%s'\n"), url);
log_info (_("processing url '%s'\n"), url);
if (myopt->user)
log_info (_(" user `%s'\n"), myopt->user);
log_info (_(" user '%s'\n"), myopt->user);
if (myopt->pass)
log_info (_(" pass `%s'\n"), *myopt->pass?"*****":"");
log_info (_(" pass '%s'\n"), *myopt->pass?"*****":"");
if (host)
log_info (_(" host `%s'\n"), host);
log_info (_(" host '%s'\n"), host);
log_info (_(" port %d\n"), port);
if (dn)
log_info (_(" DN `%s'\n"), dn);
log_info (_(" DN '%s'\n"), dn);
if (filter)
log_info (_(" filter `%s'\n"), filter);
log_info (_(" filter '%s'\n"), filter);
if (myopt->multi && !myopt->attr && ludp->lud_attrs)
{
int i;
for (i=0; ludp->lud_attrs[i]; i++)
log_info (_(" attr `%s'\n"), ludp->lud_attrs[i]);
log_info (_(" attr '%s'\n"), ludp->lud_attrs[i]);
}
else if (attr)
log_info (_(" attr `%s'\n"), attr);
log_info (_(" attr '%s'\n"), attr);
}
if (!host || !*host)
{
log_error (_("no host name in `%s'\n"), url);
log_error (_("no host name in '%s'\n"), url);
return -1;
}
if (!myopt->multi && !attr)
{
log_error (_("no attribute given for query `%s'\n"), url);
log_error (_("no attribute given for query '%s'\n"), url);
return -1;
}
@ -624,7 +624,7 @@ fetch_ldap (my_opt_t myopt, const char *url, const LDAPURLDesc *ludp)
npth_protect ();
if (!ld)
{
log_error (_("LDAP init to `%s:%d' failed: %s\n"),
log_error (_("LDAP init to '%s:%d' failed: %s\n"),
host, port, strerror (errno));
return -1;
}
@ -634,7 +634,7 @@ fetch_ldap (my_opt_t myopt, const char *url, const LDAPURLDesc *ludp)
npth_protect ();
if (ret)
{
log_error (_("binding to `%s:%d' failed: %s\n"),
log_error (_("binding to '%s:%d' failed: %s\n"),
host, port, strerror (errno));
ldap_unbind (ld);
return -1;
@ -659,9 +659,9 @@ fetch_ldap (my_opt_t myopt, const char *url, const LDAPURLDesc *ludp)
else if (rc)
{
#ifdef HAVE_W32CE_SYSTEM
log_error ("searching `%s' failed: %d\n", url, rc);
log_error ("searching '%s' failed: %d\n", url, rc);
#else
log_error (_("searching `%s' failed: %s\n"),
log_error (_("searching '%s' failed: %s\n"),
url, ldap_err2string (rc));
#endif
if (rc != LDAP_NO_SUCH_OBJECT)
@ -693,13 +693,13 @@ process_url (my_opt_t myopt, const char *url)
if (!ldap_is_ldap_url (url))
{
log_error (_("`%s' is not an LDAP URL\n"), url);
log_error (_("'%s' is not an LDAP URL\n"), url);
return -1;
}
if (ldap_url_parse (url, &ludp))
{
log_error (_("`%s' is an invalid LDAP URL\n"), url);
log_error (_("'%s' is an invalid LDAP URL\n"), url);
return -1;
}

2
dirmngr/get-path.c
View file

@ -441,7 +441,7 @@ w32_rootdir (void)
*p = 0;
else
{
log_debug ("bad filename `%s' returned for this process\n", dir);
log_debug ("bad filename '%s' returned for this process\n", dir);
*dir = 0;
}
}

24
dirmngr/ks-engine-hkp.c
View file

@ -242,11 +242,11 @@ map_host (const char *name)
if ((ec=getnameinfo (ai->ai_addr, ai->ai_addrlen,
tmphost, sizeof tmphost,
NULL, 0, NI_NAMEREQD)))
log_info ("getnameinfo failed while checking `%s': %s\n",
log_info ("getnameinfo failed while checking '%s': %s\n",
name, gai_strerror (ec));
else if (refidx+1 >= reftblsize)
{
log_error ("getnameinfo returned for `%s': `%s'"
log_error ("getnameinfo returned for '%s': '%s'"
" [index table full - ignored]\n", name, tmphost);
}
else
@ -254,7 +254,7 @@ map_host (const char *name)
if ((tmpidx = find_hostinfo (tmphost)) != -1)
{
log_info ("getnameinfo returned for `%s': `%s'"
log_info ("getnameinfo returned for '%s': '%s'"
" [already known]\n", name, tmphost);
if (ai->ai_family == AF_INET)
hosttable[tmpidx]->v4 = 1;
@ -269,12 +269,12 @@ map_host (const char *name)
}
else
{
log_info ("getnameinfo returned for `%s': `%s'\n",
log_info ("getnameinfo returned for '%s': '%s'\n",
name, tmphost);
/* Create a new entry. */
tmpidx = create_new_hostinfo (tmphost);
if (tmpidx == -1)
log_error ("map_host for `%s' problem: %s - `%s'"
log_error ("map_host for '%s' problem: %s - '%s'"
" [ignored]\n",
name, strerror (errno), tmphost);
else
@ -326,7 +326,7 @@ map_host (const char *name)
hi->poolidx = select_random_host (hi->pool);
if (hi->poolidx == -1)
{
log_error ("no alive host found in pool `%s'\n", name);
log_error ("no alive host found in pool '%s'\n", name);
return NULL;
}
}
@ -338,7 +338,7 @@ map_host (const char *name)
if (hi->dead)
{
log_error ("host `%s' marked as dead\n", hi->name);
log_error ("host '%s' marked as dead\n", hi->name);
return NULL;
}
@ -360,7 +360,7 @@ mark_host_dead (const char *name)
if (idx == -1)
return;
hi = hosttable[idx];
log_info ("marking host `%s' as dead%s\n", hi->name, hi->dead? " (again)":"");
log_info ("marking host '%s' as dead%s\n", hi->name, hi->dead? " (again)":"");
hi->dead = 1;
}
@ -502,7 +502,7 @@ send_request (ctrl_t ctrl, const char *request, const char *hostportstr,
if (err)
{
/* Fixme: After a redirection we show the old host name. */
log_error (_("error connecting to `%s': %s\n"),
log_error (_("error connecting to '%s': %s\n"),
hostportstr, gpg_strerror (err));
goto leave;
}
@ -512,7 +512,7 @@ send_request (ctrl_t ctrl, const char *request, const char *hostportstr,
err = http_wait_response (http);
if (err)
{
log_error (_("error reading HTTP response for `%s': %s\n"),
log_error (_("error reading HTTP response for '%s': %s\n"),
hostportstr, gpg_strerror (err));
goto leave;
}
@ -528,7 +528,7 @@ send_request (ctrl_t ctrl, const char *request, const char *hostportstr,
{
const char *s = http_get_header (http, "Location");
log_info (_("URL `%s' redirected to `%s' (%u)\n"),
log_info (_("URL '%s' redirected to '%s' (%u)\n"),
request, s?s:"[none]", http_get_status_code (http));
if (s && *s && redirects_left-- )
{
@ -550,7 +550,7 @@ send_request (ctrl_t ctrl, const char *request, const char *hostportstr,
goto leave;
default:
log_error (_("error accessing `%s': http status %u\n"),
log_error (_("error accessing '%s': http status %u\n"),
request, http_get_status_code (http));
err = gpg_error (GPG_ERR_NO_DATA);
goto leave;

8
dirmngr/ks-engine-http.c
View file

@ -88,7 +88,7 @@ ks_http_fetch (ctrl_t ctrl, const char *url, estream_t *r_fp)
if (err)
{
/* Fixme: After a redirection we show the old host name. */
log_error (_("error connecting to `%s': %s\n"),
log_error (_("error connecting to '%s': %s\n"),
url, gpg_strerror (err));
goto leave;
}
@ -98,7 +98,7 @@ ks_http_fetch (ctrl_t ctrl, const char *url, estream_t *r_fp)
err = http_wait_response (http);
if (err)
{
log_error (_("error reading HTTP response for `%s': %s\n"),
log_error (_("error reading HTTP response for '%s': %s\n"),
url, gpg_strerror (err));
goto leave;
}
@ -114,7 +114,7 @@ ks_http_fetch (ctrl_t ctrl, const char *url, estream_t *r_fp)
{
const char *s = http_get_header (http, "Location");
log_info (_("URL `%s' redirected to `%s' (%u)\n"),
log_info (_("URL '%s' redirected to '%s' (%u)\n"),
url, s?s:"[none]", http_get_status_code (http));
if (s && *s && redirects_left-- )
{
@ -136,7 +136,7 @@ ks_http_fetch (ctrl_t ctrl, const char *url, estream_t *r_fp)
goto leave;
default:
log_error (_("error accessing `%s': http status %u\n"),
log_error (_("error accessing '%s': http status %u\n"),
url, http_get_status_code (http));
err = gpg_error (GPG_ERR_NO_DATA);
goto leave;

4
dirmngr/ldap-url.c
View file

@ -49,7 +49,7 @@ Redistribution and use in source and binary forms, with or without
modification, are permitted provided that this notice is preserved.
The names of the copyright holders may not be used to endorse or
promote products derived from this software without their specific
prior written permission. This software is provided ``as is''
prior written permission. This software is provided `'as is''
without express or implied warranty.
---
@ -62,7 +62,7 @@ provided that this notice is preserved and that due credit is given
to the University of Michigan at Ann Arbor. The name of the
University may not be used to endorse or promote products derived
from this software without specific prior written permission. This
software is provided ``as is'' without express or implied warranty. */
software is provided `'as is'' without express or implied warranty. */
#include <config.h>

14
dirmngr/ldap.c
View file

@ -91,7 +91,7 @@ add_server_to_servers (const char *host, int port)
return;
}
log_info (_("adding `%s:%d' to the ldap server list\n"), host, port);
log_info (_("adding '%s:%d' to the ldap server list\n"), host, port);
server = xtrycalloc (1, sizeof *s);
if (!server)
log_error (_("malloc failed: %s\n"), strerror (errno));
@ -599,7 +599,7 @@ start_cert_fetch_ldap (ctrl_t ctrl, cert_fetch_context_t *context,
sl = parse_one_pattern (patterns->d);
if (!sl)
{
log_error (_("start_cert_fetch: invalid pattern `%s'\n"),
log_error (_("start_cert_fetch: invalid pattern '%s'\n"),
patterns->d);
/* fixme: cleanup argv. */
return gpg_error (GPG_ERR_INV_USER_ID);
@ -764,28 +764,28 @@ fetch_next_cert_ldap (cert_fetch_context_t context,
if (!ascii_strcasecmp (p, USERCERTIFICATE))
{
if (DBG_LOOKUP)
log_debug ("fetch_next_cert_ldap: got attribute `%s'\n",
log_debug ("fetch_next_cert_ldap: got attribute '%s'\n",
USERCERTIFICATE);
okay = 1;
}
else if (!ascii_strcasecmp (p, CACERTIFICATE))
{
if (DBG_LOOKUP)
log_debug ("fetch_next_cert_ldap: got attribute `%s'\n",
log_debug ("fetch_next_cert_ldap: got attribute '%s'\n",
CACERTIFICATE);
okay = 1;
}
else if (!ascii_strcasecmp (p, X509CACERT))
{
if (DBG_LOOKUP)
log_debug ("fetch_next_cert_ldap: got attribute `%s'\n",
log_debug ("fetch_next_cert_ldap: got attribute '%s'\n",
CACERTIFICATE);
okay = 1;
}
/* else if (!ascii_strcasecmp (p, USERSMIMECERTIFICATE)) */
/* { */
/* if (DBG_LOOKUP) */
/* log_debug ("fetch_next_cert_ldap: got attribute `%s'\n", */
/* log_debug ("fetch_next_cert_ldap: got attribute '%s'\n", */
/* USERSMIMECERTIFICATE); */
/* okay = 1; */
/* is_cms = 1; */
@ -793,7 +793,7 @@ fetch_next_cert_ldap (cert_fetch_context_t context,
else
{
if (DBG_LOOKUP)
log_debug ("fetch_next_cert_ldap: got attribute `%s'"
log_debug ("fetch_next_cert_ldap: got attribute '%s'"
" - ignored\n", p);
okay = 0;
}

2
dirmngr/misc.c
View file

@ -291,7 +291,7 @@ dump_cert (const char *text, ksba_cert_t cert)
char *p;
ksba_isotime_t t;
log_debug ("BEGIN Certificate `%s':\n", text? text:"");
log_debug ("BEGIN Certificate '%s':\n", text? text:"");
if (cert)
{
sexp = ksba_cert_get_serial (cert);

26
dirmngr/ocsp.c
View file

@ -170,7 +170,7 @@ do_ocsp_request (ctrl_t ctrl, ksba_ocsp_t ocsp, gcry_md_hd_t md,
opt.http_proxy, NULL, NULL, NULL);
if (err)
{
log_error (_("error connecting to `%s': %s\n"), url, gpg_strerror (err));
log_error (_("error connecting to '%s': %s\n"), url, gpg_strerror (err));
xfree (free_this);
return err;
}
@ -183,7 +183,7 @@ do_ocsp_request (ctrl_t ctrl, ksba_ocsp_t ocsp, gcry_md_hd_t md,
if (es_fwrite (request, requestlen, 1, http_get_write_ptr (http)) != 1)
{
err = gpg_error_from_errno (errno);
log_error ("error sending request to `%s': %s\n", url, strerror (errno));
log_error ("error sending request to '%s': %s\n", url, strerror (errno));
http_close (http, 0);
xfree (request);
xfree (free_this);
@ -196,7 +196,7 @@ do_ocsp_request (ctrl_t ctrl, ksba_ocsp_t ocsp, gcry_md_hd_t md,
if (err || http_get_status_code (http) != 200)
{
if (err)
log_error (_("error reading HTTP response for `%s': %s\n"),
log_error (_("error reading HTTP response for '%s': %s\n"),
url, gpg_strerror (err));
else
{
@ -207,7 +207,7 @@ do_ocsp_request (ctrl_t ctrl, ksba_ocsp_t ocsp, gcry_md_hd_t md,
{
const char *s = http_get_header (http, "Location");
log_info (_("URL `%s' redirected to `%s' (%u)\n"),
log_info (_("URL '%s' redirected to '%s' (%u)\n"),
url, s?s:"[none]", http_get_status_code (http));
if (s && *s && redirects_left-- )
{
@ -229,7 +229,7 @@ do_ocsp_request (ctrl_t ctrl, ksba_ocsp_t ocsp, gcry_md_hd_t md,
break;
default:
log_error (_("error accessing `%s': http status %u\n"),
log_error (_("error accessing '%s': http status %u\n"),
url, http_get_status_code (http));
err = gpg_error (GPG_ERR_NO_DATA);
break;
@ -244,7 +244,7 @@ do_ocsp_request (ctrl_t ctrl, ksba_ocsp_t ocsp, gcry_md_hd_t md,
http_close (http, 0);
if (err)
{
log_error (_("error reading HTTP response for `%s': %s\n"),
log_error (_("error reading HTTP response for '%s': %s\n"),
url, gpg_strerror (err));
xfree (free_this);
return err;
@ -254,7 +254,7 @@ do_ocsp_request (ctrl_t ctrl, ksba_ocsp_t ocsp, gcry_md_hd_t md,
&response_status);
if (err)
{
log_error (_("error parsing OCSP response for `%s': %s\n"),
log_error (_("error parsing OCSP response for '%s': %s\n"),
url, gpg_strerror (err));
xfree (response);
xfree (free_this);
@ -277,17 +277,17 @@ do_ocsp_request (ctrl_t ctrl, ksba_ocsp_t ocsp, gcry_md_hd_t md,
if (response_status == KSBA_OCSP_RSPSTATUS_SUCCESS)
{
if (opt.verbose)
log_info (_("OCSP responder at `%s' status: %s\n"), url, t);
log_info (_("OCSP responder at '%s' status: %s\n"), url, t);
err = ksba_ocsp_hash_response (ocsp, response, responselen,
HASH_FNC, md);
if (err)
log_error (_("hashing the OCSP response for `%s' failed: %s\n"),
log_error (_("hashing the OCSP response for '%s' failed: %s\n"),
url, gpg_strerror (err));
}
else
{
log_error (_("OCSP responder at `%s' status: %s\n"), url, t);
log_error (_("OCSP responder at '%s' status: %s\n"), url, t);
err = gpg_error (GPG_ERR_GENERAL);
}
@ -481,7 +481,7 @@ check_signature (ctrl_t ctrl,
{
log_error ("responder certificate ");
if (name)
log_printf ("`/%s' ", name);
log_printf ("'/%s' ", name);
if (keyid)
{
log_printf ("{");
@ -627,12 +627,12 @@ ocsp_isvalid (ctrl_t ctrl, ksba_cert_t cert, const char *cert_fpr,
url = opt.ocsp_responder;
default_signer = opt.ocsp_signer;
if (opt.verbose)
log_info (_("using default OCSP responder `%s'\n"), url);
log_info (_("using default OCSP responder '%s'\n"), url);
}
else
{
if (opt.verbose)
log_info (_("using OCSP responder `%s'\n"), url);
log_info (_("using OCSP responder '%s'\n"), url);
}
/* Ask the OCSP responder. */

4
dirmngr/server.c
View file

@ -1183,13 +1183,13 @@ cmd_loadcrl (assuan_context_t ctx, char *line)
err = crl_fetch (ctrl, line, &reader);
if (err)
log_error (_("fetching CRL from `%s' failed: %s\n"),
log_error (_("fetching CRL from '%s' failed: %s\n"),
line, gpg_strerror (err));
else
{
err = crl_cache_insert (ctrl, line, reader);
if (err)
log_error (_("processing CRL from `%s' failed: %s\n"),
log_error (_("processing CRL from '%s' failed: %s\n"),
line, gpg_strerror (err));
crl_close_reader (reader);
}

2
dirmngr/validate.c
View file

@ -879,7 +879,7 @@ check_cert_sig (ksba_cert_t issuer_cert, ksba_cert_t cert)
algo = gcry_md_map_name (algoid);
if (!algo)
{
log_error (_("unknown hash algorithm `%s'\n"), algoid? algoid:"?");
log_error (_("unknown hash algorithm '%s'\n"), algoid? algoid:"?");
return gpg_error (GPG_ERR_GENERAL);
}
s = gcry_md_algo_name (algo);