1 files changed, 3 insertions, 5 deletions
diff --git a/g13/g13.c b/g13/g13.c
index cb1880f80..9662dd028 100644
--- a/g13/g13.c
+++ b/g13/g13.c
@@ -40,6 +40,7 @@
 #include "../common/gc-opt-flags.h"
 #include "../common/asshelp.h"
 #include "../common/init.h"
+#include "../common/exechelp.h"
 #include "keyblob.h"
 #include "server.h"
 #include "runner.h"
@@ -228,10 +229,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 )
 {
@@ -378,6 +375,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);
@@ -436,8 +434,8 @@ 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);
+  assuan_control (ASSUAN_CONTROL_REINIT_SYSCALL_CLAMP, NULL);
 
   /* Setup a default control structure for command line mode.  */
   memset (&ctrl, 0, sizeof ctrl);