security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-02 22:46:30 +02:00
Code Activity

Some tweaks to the agent startup.

Browse source
This commit is contained in:
Werner Koch 2010-10-14 08:32:55 +00:00
parent 54591341a4
commit fd19a84c80
11 changed files with 88 additions and 196 deletions
Download patch file Download diff file Expand all files Collapse all files

26
common/asshelp.c
View file

@ -422,14 +422,19 @@ start_new_gpg_agent (assuan_context_t *r_ctx,
int i;
if (verbose)
log_info (_("waiting %d seconds for the %s "
"to come up\n"), 5, "agent" );
log_info (_("waiting %d seconds for the agent "
"to come up\n"), 5);
for (i=0; i < 5; i++)
{
gnupg_sleep (1);
err = assuan_socket_connect (ctx, sockname, 0, 0);
if (!err)
break;
{
if (verbose && !debug)
log_info (_("connection to agent"
" established\n"));
break;
}
}
}
}
@ -513,7 +518,7 @@ start_new_gpg_agent (assuan_context_t *r_ctx,
}
if (debug)
log_debug ("connection to agent established\n");
log_debug (_("connection to agent established\n"));
err = assuan_transact (ctx, "RESET",
NULL, NULL, NULL, NULL, NULL, NULL);
@ -606,14 +611,19 @@ start_new_dirmngr (assuan_context_t *r_ctx,
int i;
if (verbose)
log_info (_("waiting %d seconds for the %s to come up\n"),
5, "dirmngr" );
log_info (_("waiting %d seconds for the dirmngr to come up\n"),
5);
for (i=0; i < 5; i++)
{
gnupg_sleep (1);
err = assuan_socket_connect (ctx, sockname, 0, 0);
if (!err)
break;
{
if (verbose && !debug)
log_info (_("connection to the dirmngr"
" established\n"));
break;
}
}
}
}
@ -637,7 +647,7 @@ start_new_dirmngr (assuan_context_t *r_ctx,
}
if (debug)
log_debug ("connection to the dirmngr established\n");
log_debug (_("connection to the dirmngr established\n"));
*r_ctx = ctx;
return 0;