1 files changed, 1 insertions, 5 deletions
diff --git a/g13/g13.c b/g13/g13.c
index 785c91950..d9594dd52 100644
--- a/g13/g13.c
+++ b/g13/g13.c
@@ -227,10 +227,6 @@ static void start_idle_task (void);
 static void join_idle_task (void);
 
 
-/* Begin NPth wrapper functions. */
-ASSUAN_SYSTEM_NPTH_IMPL;
-
-
 static const char *
 my_strusage( int level )
 {
@@ -377,6 +373,7 @@ main (int argc, char **argv)
   init_common_subsystems (&argc, &argv);
 
   npth_init ();
+  gpgrt_set_syscall_clamp (npth_unprotect, npth_protect);
 
   /* Take extra care of the random pool.  */
   gcry_control (GCRYCTL_USE_SECURE_RNDPOOL);
@@ -435,7 +432,6 @@ main (int argc, char **argv)
 
   /* Prepare libassuan.  */
   assuan_set_gpg_err_source (GPG_ERR_SOURCE_DEFAULT);
-  assuan_set_system_hooks (ASSUAN_SYSTEM_NPTH);
   setup_libassuan_logging (&opt.debug, NULL);
 
   /* Setup a default control structure for command line mode.  */