mirror of git://git.gnupg.org/gnupg.git
tools: Add TPM2DAEMON_SOCK_NAME for --remove-socketdir.
* tools/gpgconf.c (main): Care about tpm2d. Emit correct ERR.
--
Cherry-picked from master commit of:
25c84ffd10
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
parent
d17efdcd6f
commit
e783866f41
|
@ -963,7 +963,8 @@ main (int argc, char **argv)
|
||||||
GPG_AGENT_SSH_SOCK_NAME,
|
GPG_AGENT_SSH_SOCK_NAME,
|
||||||
SCDAEMON_SOCK_NAME,
|
SCDAEMON_SOCK_NAME,
|
||||||
KEYBOXD_SOCK_NAME,
|
KEYBOXD_SOCK_NAME,
|
||||||
DIRMNGR_SOCK_NAME
|
DIRMNGR_SOCK_NAME,
|
||||||
|
TPM2DAEMON_SOCK_NAME
|
||||||
};
|
};
|
||||||
int i;
|
int i;
|
||||||
char *p;
|
char *p;
|
||||||
|
@ -976,8 +977,11 @@ main (int argc, char **argv)
|
||||||
xfree (p);
|
xfree (p);
|
||||||
}
|
}
|
||||||
if (gnupg_rmdir (socketdir))
|
if (gnupg_rmdir (socketdir))
|
||||||
gc_error (1, 0, "error removing '%s': %s",
|
{
|
||||||
socketdir, gpg_strerror (err));
|
err = gpg_error_from_syserror ();
|
||||||
|
gc_error (1, 0, "error removing '%s': %s",
|
||||||
|
socketdir, gpg_strerror (err));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else if (gpg_err_code (err) == GPG_ERR_ENOENT)
|
else if (gpg_err_code (err) == GPG_ERR_ENOENT)
|
||||||
gc_error (0, 0, "warning: removing '%s' failed: %s",
|
gc_error (0, 0, "warning: removing '%s' failed: %s",
|
||||||
|
|
Loading…
Reference in New Issue