diff options
| author | Werner Koch <wk@gnupg.org> | 2012-02-06 20:50:47 +0100 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2012-02-06 20:50:47 +0100 |
| commit | eb0faef81dae2cba1f62056fdc4dc2a7d58ac86a (patch) | |
| tree | 7ada65b8c11f45aeb6beae3fce3959d4513c5ac3 /dirmngr | |
| parent | Also let GENKEY and PKDECRYPT send the INQUIRE_MAXLEN status message. (diff) | |
| download | gnupg2-eb0faef81dae2cba1f62056fdc4dc2a7d58ac86a.tar.xz gnupg2-eb0faef81dae2cba1f62056fdc4dc2a7d58ac86a.zip | |
common: Add a global variable to for the default error source.
For the shared code parts it is cumbersome to pass an error sourse
variable to each function. Its value is always a constant for a given
binary and thus a global variable makes things a lot easier than the
former macro stuff.
* common/init.c (default_errsource): New global var.
(init_common_subsystems): Rename to _init_common_subsystems. Set
DEFAULT_ERRSOURCE.
* common/init.h: Assert value of GPG_ERR_SOURCE_DEFAULT.
(init_common_subsystems): New macro.
* common/util.h (default_errsource): Add declaration.
* kbx/keybox-defs.h: Add some GPG_ERR_SOURCE_DEFAULT trickery.
Diffstat (limited to 'dirmngr')
| -rw-r--r-- | dirmngr/dirmngr.c | 1 | ||||
| -rw-r--r-- | dirmngr/dirmngr_ldap.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/dirmngr/dirmngr.c b/dirmngr/dirmngr.c index b0410afd0..ee857189f 100644 --- a/dirmngr/dirmngr.c +++ b/dirmngr/dirmngr.c @@ -56,6 +56,7 @@ #include "ldapserver.h" #include "asshelp.h" #include "ldap-wrapper.h" +#include "../common/init.h" /* The plain Windows version uses the windows service system. For example to start the service you may use "sc start dirmngr". diff --git a/dirmngr/dirmngr_ldap.c b/dirmngr/dirmngr_ldap.c index f166f19e2..2e7349392 100644 --- a/dirmngr/dirmngr_ldap.c +++ b/dirmngr/dirmngr_ldap.c @@ -57,6 +57,7 @@ #include "i18n.h" #include "util.h" +#include "../common/init.h" /* With the ldap wrapper, there is no need for the npth_unprotect and leave functions; thus we redefine them to nops. If we are not using the |