mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
Merge branch 'STABLE-BRANCH-2-2' into master
-- Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
commit
c817e75028
20 changed files with 429 additions and 252 deletions
|
@ -282,6 +282,10 @@ default values are 15 and 2 seconds. Note that the timeout values are
|
|||
for each connection attempt; the connection code will attempt to
|
||||
connect all addresses listed for a server.
|
||||
|
||||
@item --listen-backlog @var{n}
|
||||
@opindex listen-backlog
|
||||
Set the size of the queue for pending connections. The default is 64.
|
||||
|
||||
@item --allow-version-check
|
||||
@opindex allow-version-check
|
||||
Allow Dirmngr to connect to @code{https://versions.gnupg.org} to get
|
||||
|
|
|
@ -31,8 +31,7 @@
|
|||
#
|
||||
# Example file:
|
||||
#==========
|
||||
# :staff gpg-agent allow-mark-trusted [change]
|
||||
# gpg-agent min-passphrase-len 6
|
||||
# :staff gpg-agent min-passphrase-len 6 [change]
|
||||
#
|
||||
# * gpg-agent min-passphrase-len [no-change] 8
|
||||
# gpg-agent min-passphrase-nonalpha [no-change] 1
|
||||
|
@ -42,9 +41,9 @@
|
|||
# gpg-agent enforce-passphrase-constraints [no-change]
|
||||
# gpg-agent max-cache-ttl [no-change] 10800
|
||||
# gpg-agent max-cache-ttl-ssh [no-change] 10800
|
||||
# gpg-agent allow-mark-trusted [default]
|
||||
# gpg-agent allow-mark-trusted [no-change]
|
||||
# gpgsm enable-ocsp
|
||||
# gpg compliance [no-change]
|
||||
# gpgsm compliance [no-change]
|
||||
#===========
|
||||
# All users in the group "staff" are allowed to change the value for
|
||||
# --allow-mark-trusted; gpgconf's default is not to allow a change
|
||||
|
|
|
@ -563,6 +563,9 @@ Ignore requests to change the current @code{tty} or X window system's
|
|||
@code{DISPLAY} variable respectively. This is useful to lock the
|
||||
pinentry to pop up at the @code{tty} or display you started the agent.
|
||||
|
||||
@item --listen-backlog @var{n}
|
||||
@opindex listen-backlog
|
||||
Set the size of the queue for pending connections. The default is 64.
|
||||
|
||||
@anchor{option --extra-socket}
|
||||
@item --extra-socket @var{name}
|
||||
|
|
|
@ -236,6 +236,12 @@ a list of categories see the Libassuan manual.
|
|||
Don't detach the process from the console. This is mainly useful for
|
||||
debugging.
|
||||
|
||||
@item --listen-backlog @var{n}
|
||||
@opindex listen-backlog
|
||||
Set the size of the queue for pending connections. The default is 64.
|
||||
This option has an effect only if @option{--multi-server} is also
|
||||
used.
|
||||
|
||||
@item --log-file @var{file}
|
||||
@opindex log-file
|
||||
Append all logging output to @var{file}. This is very helpful in
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue