security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-22 10:19:57 +01:00
Code Activity

New configure optionh --enable-dirmngr-auto-start.

Browse Source 
autogen.sh enables this for CE.
This commit is contained in:
Werner Koch 2010-10-08 14:37:42 +00:00
parent a78335c9ce
commit a3335428be
4 changed files with 35 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2010-10-08 Werner Koch <wk@g10code.com>
* configure.ac: Add option --enable-dirmngr-auto-start.
(USE_DIRMNGR_AUTO_START): New ac_define.
* autogen.sh <--build-w32ce>: Use new option.
2010-10-06 Werner Koch <wk@g10code.com> 2010-10-06 Werner Koch <wk@g10code.com>
* configure.ac: Make --enable-standard-socket the default. * configure.ac: Make --enable-standard-socket the default.

3
autogen.sh
View File

@ -103,7 +103,8 @@ if [ "$myhost" = "w32" ]; then
w32root="$w32ce_root" w32root="$w32ce_root"
[ -z "$w32root" ] && w32root="$HOME/w32ce_root" [ -z "$w32root" ] && w32root="$HOME/w32ce_root"
toolprefixes="$w32ce_toolprefixes arm-mingw32ce" toolprefixes="$w32ce_toolprefixes arm-mingw32ce"
extraoptions="--disable-scdaemon --disable-zip $w32ce_extraoptions" extraoptions="--enable-dirmngr-auto-start --disable-scdaemon "
extraoptions="$extraoptions --disable-zip $w32ce_extraoptions"
;; ;;
*) *)
[ -z "$w32root" ] && w32root="$HOME/w32root" [ -z "$w32root" ] && w32root="$HOME/w32root"

10
common/asshelp.c
View File

@ -547,7 +547,6 @@ start_new_dirmngr (assuan_context_t *r_ctx,
gpg_error_t err; gpg_error_t err;
assuan_context_t ctx; assuan_context_t ctx;
const char *sockname; const char *sockname;
lock_spawn_t lock;
*r_ctx = NULL; *r_ctx = NULL;
@ -560,8 +559,10 @@ start_new_dirmngr (assuan_context_t *r_ctx,
sockname = dirmngr_socket_name (); sockname = dirmngr_socket_name ();
err = assuan_socket_connect (ctx, sockname, 0, 0); err = assuan_socket_connect (ctx, sockname, 0, 0);
#ifdef USE_DIRMNGR_AUTO_START
if (err) if (err)
{ {
lock_spawn_t lock;
const char *argv[2]; const char *argv[2];
/* With no success try start a new Dirmngr. On most systems /* With no success try start a new Dirmngr. On most systems
@ -619,6 +620,13 @@ start_new_dirmngr (assuan_context_t *r_ctx,
unlock_spawning (&lock, "dirmngr"); unlock_spawning (&lock, "dirmngr");
} }
#else
(void)homedir;
(void)dirmngr_program;
(void)verbose;
(void)status_cb;
(void)status_cb_arg;
#endif /*USE_DIRMNGR_AUTO_START*/
if (err) if (err)
{ {

18
configure.ac
View File

@ -80,6 +80,7 @@ use_exec=yes
disable_keyserver_path=no disable_keyserver_path=no
use_ccid_driver=yes use_ccid_driver=yes
use_standard_socket=yes use_standard_socket=yes
dirmngr_auto_start=no
try_ks_ldap=no try_ks_ldap=no
@ -339,6 +340,22 @@ AC_ARG_ENABLE(ccid-driver,
use_ccid_driver=$enableval) use_ccid_driver=$enableval)
AC_MSG_RESULT($use_ccid_driver) AC_MSG_RESULT($use_ccid_driver)
#
# Dirmngr is nowadays a system service and thus it usually does no
# make sense to start it as needed. However on some systems this is
# possible; this option enable the feature.
#
AC_MSG_CHECKING([whether to auto start dirmngr])
AC_ARG_ENABLE(dirmngr-auto-start,
AC_HELP_STRING([--enable-dirmngr-auto-start],
[enable auto starting of the dirmngr]),
dirmngr_auto_start=$enableval)
AC_MSG_RESULT($dirmngr_auto_start)
if test "$dirmngr_auto_start" = yes ; then
AC_DEFINE(USE_DIRMNGR_AUTO_START,1,
[Define to enable auto starting of the dirmngr])
fi
# #
# To avoid double inclusion of config.h which might happen at some # To avoid double inclusion of config.h which might happen at some
@ -1655,6 +1672,7 @@ echo "
Default dirmngr: $show_gnupg_dirmngr_pgm Default dirmngr: $show_gnupg_dirmngr_pgm
Use standard socket: $use_standard_socket Use standard socket: $use_standard_socket
Dirmngr auto start: $dirmngr_auto_start
" "
if test x"$use_regex" != xyes ; then if test x"$use_regex" != xyes ; then
echo " echo "