diff options
| author | NIIBE Yutaka <[email protected]> | 2024-06-11 06:36:17 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2024-07-01 12:13:51 +0000 |
| commit | 76066d71f49e09a013afb4e5482030bee392c55c (patch) | |
| tree | 2c2745bbc599a7b108f902719ebc227574af7df0 | |
| parent | agent: Fix a race condition which results accessing finished scd. (diff) | |
| download | gnupg-76066d71f49e09a013afb4e5482030bee392c55c.tar.gz gnupg-76066d71f49e09a013afb4e5482030bee392c55c.zip | |
agent: Clean up for scdaemon handling.
* agent/call-daemon.c (struct daemon_local_s): Remove G field.
--
Signed-off-by: NIIBE Yutaka <[email protected]>
(cherry picked from commit 55559c8b66ff495fa7102d1f856cb2c00b76efbd)
| -rw-r--r-- | agent/call-daemon.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/agent/call-daemon.c b/agent/call-daemon.c index f200af28f..7753afe22 100644 --- a/agent/call-daemon.c +++ b/agent/call-daemon.c @@ -56,9 +56,6 @@ struct daemon_local_s DAEMON_LOCAL_LIST (see below). */ struct daemon_local_s *next_local; - /* Link back to the global structure. */ - struct daemon_global_s *g; - assuan_context_t ctx; /* NULL or session context for the daemon used with this connection. */ unsigned int in_use: 1; /* CTX is in use. */ @@ -310,7 +307,6 @@ daemon_start (enum daemon_type type, ctrl_t ctrl) strerror (rc)); return err; } - ctrl->d_local[type]->g = g; ctrl->d_local[type]->next_local = g->local_list; g->local_list = ctrl->d_local[type]; /* FIXME: CHECK the G thing */ } @@ -621,7 +617,7 @@ agent_reset_daemon (ctrl_t ctrl) for (i = 0; i < DAEMON_MAX_TYPE; i++) if (ctrl->d_local[i]) { - struct daemon_global_s *g = ctrl->d_local[i]->g; + struct daemon_global_s *g = &daemon_global[i]; if (ctrl->d_local[i]->ctx) { |