security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-04-17 15:44:34 +02:00
Code Activity

tools: Add TPM2DAEMON_SOCK_NAME for --remove-socketdir.

Browse Source 
* tools/gpgconf.c (main): Care about tpm2d.  Emit correct ERR.

--

Cherry-picked from master commit of:
	25c84ffd1078e6619761aa731a82dbaf4175c02e

Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka 2023-10-03 16:51:46 +09:00
parent d17efdcd6f
commit e783866f41
No known key found for this signature in database
GPG Key ID: 640114AF89DE6054
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/gpgconf.c
View File

@ -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,9 +977,12 @@ main (int argc, char **argv)
xfree (p); xfree (p);
} }
if (gnupg_rmdir (socketdir)) if (gnupg_rmdir (socketdir))
{
err = gpg_error_from_syserror ();
gc_error (1, 0, "error removing '%s': %s", gc_error (1, 0, "error removing '%s': %s",
socketdir, gpg_strerror (err)); 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",
socketdir, gpg_strerror (err)); socketdir, gpg_strerror (err));