diff options
| author | Werner Koch <[email protected]> | 2015-04-06 11:42:17 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2015-04-06 11:42:17 +0000 |
| commit | 24a75201da6be72edf85b96dbc0c01c747d02c6a (patch) | |
| tree | ded5739c5a3d8a1ad6c241732809aefdb1555f59 /sm | |
| parent | Fix use of DBG_CACHE and DBG_LOOKUP (diff) | |
| download | gnupg-24a75201da6be72edf85b96dbc0c01c747d02c6a.tar.gz gnupg-24a75201da6be72edf85b96dbc0c01c747d02c6a.zip | |
Rename DBG_ASSUAN to DBG_IPC and add separate DBG_EXTPROG.
* g10/options.h (DBG_EXTPROG_VALUE): Separate from DBG_IPC_VALUE.
Diffstat (limited to '')
| -rw-r--r-- | sm/call-agent.c | 2 | ||||
| -rw-r--r-- | sm/call-dirmngr.c | 2 | ||||
| -rw-r--r-- | sm/gpgsm.c | 8 | ||||
| -rw-r--r-- | sm/gpgsm.h | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/sm/call-agent.c b/sm/call-agent.c index f579200ff..4b2ec3390 100644 --- a/sm/call-agent.c +++ b/sm/call-agent.c @@ -95,7 +95,7 @@ start_agent (ctrl_t ctrl) opt.agent_program, opt.lc_ctype, opt.lc_messages, opt.session_env, - opt.autostart, opt.verbose, DBG_ASSUAN, + opt.autostart, opt.verbose, DBG_IPC, gpgsm_status2, ctrl); if (!opt.autostart && gpg_err_code (rc) == GPG_ERR_NO_AGENT) diff --git a/sm/call-dirmngr.c b/sm/call-dirmngr.c index f8cfdf8e8..560ea7208 100644 --- a/sm/call-dirmngr.c +++ b/sm/call-dirmngr.c @@ -209,7 +209,7 @@ start_dirmngr_ext (ctrl_t ctrl, assuan_context_t *ctx_r) err = start_new_dirmngr (&ctx, GPG_ERR_SOURCE_DEFAULT, opt.homedir, opt.dirmngr_program, - opt.autostart, opt.verbose, DBG_ASSUAN, + opt.autostart, opt.verbose, DBG_IPC, gpgsm_status2, ctrl); if (!opt.autostart && gpg_err_code (err) == GPG_ERR_NO_DIRMNGR) { diff --git a/sm/gpgsm.c b/sm/gpgsm.c index 773cf9cab..8cd7e84e6 100644 --- a/sm/gpgsm.c +++ b/sm/gpgsm.c @@ -670,11 +670,11 @@ set_debug (void) else if (!strcmp (debug_level, "none") || (numok && numlvl < 1)) opt.debug = 0; else if (!strcmp (debug_level, "basic") || (numok && numlvl <= 2)) - opt.debug = DBG_ASSUAN_VALUE; + opt.debug = DBG_IPC_VALUE; else if (!strcmp (debug_level, "advanced") || (numok && numlvl <= 5)) - opt.debug = DBG_ASSUAN_VALUE|DBG_X509_VALUE; + opt.debug = DBG_IPC_VALUE|DBG_X509_VALUE; else if (!strcmp (debug_level, "expert") || (numok && numlvl <= 8)) - opt.debug = (DBG_ASSUAN_VALUE|DBG_X509_VALUE + opt.debug = (DBG_IPC_VALUE|DBG_X509_VALUE |DBG_CACHE_VALUE|DBG_CRYPTO_VALUE); else if (!strcmp (debug_level, "guru") || numok) { @@ -714,7 +714,7 @@ set_debug (void) (opt.debug & DBG_CACHE_VALUE )? " cache":"", (opt.debug & DBG_MEMSTAT_VALUE)? " memstat":"", (opt.debug & DBG_HASHING_VALUE)? " hashing":"", - (opt.debug & DBG_ASSUAN_VALUE )? " assuan":"" ); + (opt.debug & DBG_IPC_VALUE )? " ipc":"" ); } diff --git a/sm/gpgsm.h b/sm/gpgsm.h index 63c9d0b27..187ed8368 100644 --- a/sm/gpgsm.h +++ b/sm/gpgsm.h @@ -153,14 +153,14 @@ struct #define DBG_CACHE_VALUE 64 /* debug the caching */ #define DBG_MEMSTAT_VALUE 128 /* show memory statistics */ #define DBG_HASHING_VALUE 512 /* debug hashing operations */ -#define DBG_ASSUAN_VALUE 1024 /* debug assuan communication */ +#define DBG_IPC_VALUE 1024 /* debug assuan communication */ #define DBG_X509 (opt.debug & DBG_X509_VALUE) #define DBG_CRYPTO (opt.debug & DBG_CRYPTO_VALUE) #define DBG_MEMORY (opt.debug & DBG_MEMORY_VALUE) #define DBG_CACHE (opt.debug & DBG_CACHE_VALUE) #define DBG_HASHING (opt.debug & DBG_HASHING_VALUE) -#define DBG_ASSUAN (opt.debug & DBG_ASSUAN_VALUE) +#define DBG_IPC (opt.debug & DBG_IPC_VALUE) /* Forward declaration for an object defined in server.c */ struct server_local_s; |