aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorNIIBE Yutaka <[email protected]>2018-07-12 08:09:14 +0000
committerNIIBE Yutaka <[email protected]>2018-07-12 08:09:14 +0000
commite8caa282d3d5f286919a1ed3db6699c555b7e89d (patch)
tree1762014bacef69c542923f55dfe83a2f925d7999 /tools
parentg10: Fix enum_secret_keys for card keys. (diff)
parentgpg: Remove multiple subkey bindings during export-clean. (diff)
downloadgnupg-gniibe/decryption-key.tar.gz
gnupg-gniibe/decryption-key.zip
Merge branch 'master' into gniibe/decryption-keygniibe/decryption-key
Diffstat (limited to 'tools')
-rw-r--r--tools/send-mail.c2
-rw-r--r--tools/watchgnupg.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/send-mail.c b/tools/send-mail.c
index 9f07c7ac5..6492c43c1 100644
--- a/tools/send-mail.c
+++ b/tools/send-mail.c
@@ -33,7 +33,7 @@ static gpg_error_t
run_sendmail (estream_t data)
{
gpg_error_t err;
- const char pgmname[] = "/usr/lib/sendmail";
+ const char pgmname[] = NAME_OF_SENDMAIL;
const char *argv[3];
argv[0] = "-oi";
diff --git a/tools/watchgnupg.c b/tools/watchgnupg.c
index fc58d1428..1db1c7827 100644
--- a/tools/watchgnupg.c
+++ b/tools/watchgnupg.c
@@ -253,7 +253,7 @@ static void
print_version (int with_help)
{
fputs (MYVERSION_LINE "\n"
- "Copyright (C) 2017 Free Software Foundation, Inc.\n"
+ GNUPG_DEF_COPYRIGHT_LINE "\n"
"License GPLv3+: "
"GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>\n"
"This is free software: you are free to change and redistribute it.\n"