diff options
| author | NIIBE Yutaka <[email protected]> | 2016-10-07 01:45:22 +0000 |
|---|---|---|
| committer | NIIBE Yutaka <[email protected]> | 2016-10-07 01:45:22 +0000 |
| commit | fc0b392e766af8127094e8b529d25abb84ad1d65 (patch) | |
| tree | 5a25deae2db66cbe5257ccd701e94308f826fe2e /common/init.c | |
| parent | common: Avoid pointer arithmetic on string literals. (diff) | |
| download | gnupg-fc0b392e766af8127094e8b529d25abb84ad1d65.tar.gz gnupg-fc0b392e766af8127094e8b529d25abb84ad1d65.zip | |
agent, dirmngr, scd: Fix init_common_subsystems.
* common/init.c (_init_common_subsystems): Don't call
gpgrt_set_syscall_clamp in this function.
* agent/gpg-agent.c, dirmngr/dirmngr.c, scd/scdaemon.c: Call
gpgrt_set_syscall_clamp after npth_init.
--
Signed-off-by: NIIBE Yutaka <[email protected]>
Diffstat (limited to 'common/init.c')
| -rw-r--r-- | common/init.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/common/init.c b/common/init.c index 8a8626682..cb4228a39 100644 --- a/common/init.c +++ b/common/init.c @@ -29,20 +29,12 @@ #include <config.h> -#ifdef WITHOUT_NPTH /* Give the Makefile a chance to build without Pth. */ -#undef HAVE_NPTH -#undef USE_NPTH -#endif - #ifdef HAVE_W32_SYSTEM # ifdef HAVE_WINSOCK2_H # include <winsock2.h> # endif # include <windows.h> #endif -#ifdef HAVE_NPTH -# include <npth.h> -#endif #ifdef HAVE_W32CE_SYSTEM # include <assuan.h> /* For _assuan_w32ce_finish_pipe. */ #endif @@ -197,9 +189,6 @@ _init_common_subsystems (gpg_err_source_t errsource, int *argcp, char ***argvp) /* Initialize the Estream library. */ gpgrt_init (); gpgrt_set_alloc_func (gcry_realloc); -#ifdef USE_NPTH - gpgrt_set_syscall_clamp (npth_unprotect, npth_protect); -#endif /* Special hack for Windows CE: We extract some options from arg to setup the standard handles. */ |