mirror of
git://git.gnupg.org/gnupg.git
synced 2024-12-22 10:19:57 +01:00
gpgtar: Do not allow the use of stdout for --status-fd
* tools/gpgtar.c (main): Don't allow logging via the Registry. Forbid using stdout for status-fd in crypt mode. -- Without that check a status output would be mixed up with the input to the internal call of gpg. Using the Registry key to enable logging is very annoying.
This commit is contained in:
parent
56b65f33d2
commit
e5066f2d1c
@ -459,7 +459,7 @@ main (int argc, char **argv)
|
|||||||
|
|
||||||
gnupg_reopen_std (GPGTAR_NAME);
|
gnupg_reopen_std (GPGTAR_NAME);
|
||||||
gpgrt_set_strusage (my_strusage);
|
gpgrt_set_strusage (my_strusage);
|
||||||
log_set_prefix (GPGTAR_NAME, GPGRT_LOG_WITH_PREFIX);
|
log_set_prefix (GPGTAR_NAME, GPGRT_LOG_WITH_PREFIX|GPGRT_LOG_NO_REGISTRY);
|
||||||
|
|
||||||
/* Make sure that our subsystems are ready. */
|
/* Make sure that our subsystems are ready. */
|
||||||
i18n_init();
|
i18n_init();
|
||||||
@ -501,7 +501,11 @@ main (int argc, char **argv)
|
|||||||
log_fatal ("status-fd is invalid: %s\n", strerror (errno));
|
log_fatal ("status-fd is invalid: %s\n", strerror (errno));
|
||||||
|
|
||||||
if (fd == 1)
|
if (fd == 1)
|
||||||
|
{
|
||||||
opt.status_stream = es_stdout;
|
opt.status_stream = es_stdout;
|
||||||
|
if (!skip_crypto)
|
||||||
|
log_fatal ("using stdout for the status-fd is not possible\n");
|
||||||
|
}
|
||||||
else if (fd == 2)
|
else if (fd == 2)
|
||||||
opt.status_stream = es_stderr;
|
opt.status_stream = es_stderr;
|
||||||
else
|
else
|
||||||
|
Loading…
x
Reference in New Issue
Block a user