diff options
| author | NIIBE Yutaka <gniibe@fsij.org> | 2018-11-26 02:37:02 +0100 |
|---|---|---|
| committer | NIIBE Yutaka <gniibe@fsij.org> | 2018-11-26 02:37:02 +0100 |
| commit | f45d6124696cc92ccdec09841b8182679c377997 (patch) | |
| tree | e25e3ffd0b2c0cb4c1e036a5eab84f1d198e7b1b | |
| parent | dirmngr: Avoid possible CSRF attacks via http redirects. (diff) | |
| download | gnupg2-f45d6124696cc92ccdec09841b8182679c377997.tar.xz gnupg2-f45d6124696cc92ccdec09841b8182679c377997.zip | |
agent: Clean up SCDaemon management.
* agent/call-scd.c (struct scd_local_s): Remove ctrl_backlink.
(start_scd): Don't assign to the field.
(agent_scd_check_aliveness): Fix typo in comment.
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
| -rw-r--r-- | agent/call-scd.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/agent/call-scd.c b/agent/call-scd.c index 51d9abd70..954be0238 100644 --- a/agent/call-scd.c +++ b/agent/call-scd.c @@ -54,12 +54,6 @@ struct scd_local_s SCD_LOCAL_LIST (see below). */ struct scd_local_s *next_local; - /* We need to get back to the ctrl object actually referencing this - structure. This is really an awkward way of enumerating the local - contexts. A much cleaner way would be to keep a global list of - ctrl objects to enumerate them. */ - ctrl_t ctrl_backlink; - assuan_context_t ctx; /* NULL or session context for the SCdaemon used with this connection. */ int locked; /* This flag is used to assert proper use of @@ -218,7 +212,6 @@ start_scd (ctrl_t ctrl) ctrl->scd_local = xtrycalloc (1, sizeof *ctrl->scd_local); if (!ctrl->scd_local) return gpg_error_from_syserror (); - ctrl->scd_local->ctrl_backlink = ctrl; ctrl->scd_local->next_local = scd_local_list; scd_local_list = ctrl->scd_local; } @@ -497,7 +490,7 @@ agent_scd_check_aliveness (void) now but take care that it won't do another wait. Also cleanup all other connections and release their resources. The next use will start a new daemon then. - Due to the use of the START_SCD_LOCAL we are sure that + Due to the use of the START_SCD_LOCK we are sure that none of these context are actually in use. */ struct scd_local_s *sl; |