1 files changed, 7 insertions, 12 deletions

diff --git a/kbx/keyboxd.c b/kbx/keyboxd.c
index f875e115d..f9792789d 100644
--- a/kbx/keyboxd.c
+++ b/kbx/keyboxd.c
@@ -257,10 +257,6 @@ static void kbxd_deinit_default_ctrl (ctrl_t ctrl);
 static void handle_connections (gnupg_fd_t listen_fd);
 static void check_own_socket (void);
 static int check_for_running_kbxd (int silent);
-
-/* Pth wrapper function definitions. */
-ASSUAN_SYSTEM_NPTH_IMPL;
-
 
 /*
  * Functions.
@@ -440,6 +436,7 @@ thread_init_once (void)
    * initialized and thus Libgcrypt could not set its system call
    * clamp.  */
   gcry_control (GCRYCTL_REINIT_SYSCALL_CLAMP, 0, 0);
+  assuan_control (ASSUAN_CONTROL_REINIT_SYSCALL_CLAMP, NULL);
 }
 
 
@@ -447,7 +444,6 @@ static void
 initialize_modules (void)
 {
   thread_init_once ();
-  assuan_set_system_hooks (ASSUAN_SYSTEM_NPTH);
 }
 
 
@@ -497,7 +493,6 @@ main (int argc, char **argv )
   assuan_set_malloc_hooks (&malloc_hooks);
   assuan_set_gpg_err_source (GPG_ERR_SOURCE_DEFAULT);
   assuan_sock_init ();
-  assuan_sock_set_system_hooks (ASSUAN_SYSTEM_NPTH);
   setup_libassuan_logging (&opt.debug, kbxd_assuan_log_monitor);
 
   setup_libgcrypt_logging ();
@@ -1396,7 +1391,7 @@ check_nonce (ctrl_t ctrl, assuan_sock_nonce_t *nonce)
   if (assuan_sock_check_nonce (ctrl->thread_startup.fd, nonce))
     {
       log_info (_("error reading nonce on fd %d: %s\n"),
-                FD2INT(ctrl->thread_startup.fd), strerror (errno));
+                FD_DBG (ctrl->thread_startup.fd), strerror (errno));
       assuan_sock_close (ctrl->thread_startup.fd);
       xfree (ctrl);
       return -1;
@@ -1416,7 +1411,7 @@ do_start_connection_thread (ctrl_t ctrl)
   kbxd_init_default_ctrl (ctrl);
   if (opt.verbose && !DBG_IPC)
     log_info (_("handler 0x%lx for fd %d started\n"),
-              (unsigned long) npth_self(), FD2INT(ctrl->thread_startup.fd));
+              (unsigned long) npth_self(), FD_DBG (ctrl->thread_startup.fd));
 
   session_id = ++last_session_id;
   if (!session_id)
@@ -1424,7 +1419,7 @@ do_start_connection_thread (ctrl_t ctrl)
   kbxd_start_command_handler (ctrl, ctrl->thread_startup.fd, session_id);
   if (opt.verbose && !DBG_IPC)
     log_info (_("handler 0x%lx for fd %d terminated\n"),
-              (unsigned long) npth_self(), FD2INT(ctrl->thread_startup.fd));
+              (unsigned long) npth_self(), FD_DBG (ctrl->thread_startup.fd));
 
   kbxd_deinit_default_ctrl (ctrl);
   xfree (ctrl);
@@ -1522,7 +1517,7 @@ handle_connections (gnupg_fd_t listen_fd)
 
   FD_ZERO (&fdset);
   FD_SET (FD2INT (listen_fd), &fdset);
-  nfd = FD2INT (listen_fd);
+  nfd = FD2NUM (listen_fd);
   if (sock_inotify_fd != -1)
     {
       FD_SET (sock_inotify_fd, &fdset);
@@ -1653,8 +1648,8 @@ handle_connections (gnupg_fd_t listen_fd)
                 continue;
 
               plen = sizeof paddr;
-              fd = INT2FD (npth_accept (FD2INT(listentbl[idx].l_fd),
-                                        (struct sockaddr *)&paddr, &plen));
+              fd = assuan_sock_accept (listentbl[idx].l_fd,
+                                       (struct sockaddr *)&paddr, &plen);
               if (fd == GNUPG_INVALID_FD)
                 {
                   log_error ("accept failed for %s: %s\n",