diff --git a/src/assuan.h.in b/src/assuan.h.in
index 10917c9..30a243c 100644
--- a/src/assuan.h.in
+++ b/src/assuan.h.in
@@ -1,614 +1,619 @@
 /* assuan.h - Definitions for the Assuan IPC library             -*- c -*-
  * Copyright (C) 2001-2013 Free Software Foundation, Inc.
  * Copyright (C) 2001-2021 g10 Code GmbH
  *
  * This file is part of Assuan.
  *
  * Assuan is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as
  * published by the Free Software Foundation; either version 2.1 of
  * the License, or (at your option) any later version.
  *
  * Assuan is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  * SPDX-License-Identifier: LGPL-2.1-or-later
  *
  * @configure_input@
  */
 
 /* Compile time configuration:
  *
  * #define _ASSUAN_NO_SOCKET_WRAPPER
  *
  * Do not include the definitions for the socket wrapper feature.
  */
 
 #ifndef ASSUAN_H
 #define ASSUAN_H
 
 #include <stdio.h>
 #include <sys/types.h>
 #include <unistd.h>
 #include <stdarg.h>
 
 #ifndef _ASSUAN_NO_SOCKET_WRAPPER
 @include:includes@
 #endif /*!_ASSUAN_NO_SOCKET_WRAPPER*/
 
 @include:types@
 
 #include <gpg-error.h>
 
 #ifdef __cplusplus
 extern "C"
 {
 #if 0
 }
 #endif
 #endif
 
 /* The version of this header should match the one of the library.  Do
  * not use this symbol in your application; use assuan_check_version
  * instead.  */
 #define ASSUAN_VERSION @version@
 
 /* The version number of this header.  It may be used to handle minor
  * API incompatibilities.  */
 #define ASSUAN_VERSION_NUMBER @version-number@
 
 
 /* Check for compiler features.  */
 #if __GNUC__
 #define _ASSUAN_GCC_VERSION (__GNUC__ * 10000 \
                             + __GNUC_MINOR__ * 100 \
                             + __GNUC_PATCHLEVEL__)
 
 #if _ASSUAN_GCC_VERSION > 30100
 #define _ASSUAN_DEPRECATED  __attribute__ ((__deprecated__))
 #endif
 #endif
 #ifndef _ASSUAN_DEPRECATED
 #define _ASSUAN_DEPRECATED
 #endif
 
 
 #define ASSUAN_LINELENGTH 1002 /* 1000 + [CR,]LF */
 
 struct assuan_context_s;
 typedef struct assuan_context_s *assuan_context_t;
 @include:fd-t@
 
 assuan_fd_t assuan_fdopen (int fd);
 
 @include:sock-nonce@
 
 
 /*
  * Global interface.
  */
 
 struct assuan_malloc_hooks
 {
   void *(*malloc) (size_t cnt);
   void *(*realloc) (void *ptr, size_t cnt);
   void (*free) (void *ptr);
 };
 typedef struct assuan_malloc_hooks *assuan_malloc_hooks_t;
 
 /* Categories for log messages.  */
 #define ASSUAN_LOG_INIT 1
 #define ASSUAN_LOG_CTX 2
 #define ASSUAN_LOG_ENGINE 3
 #define ASSUAN_LOG_DATA 4
 #define ASSUAN_LOG_SYSIO 5
 #define ASSUAN_LOG_CONTROL 8
 
 /* If MSG is NULL, return true/false depending on if this category is
  * logged.  This is used to probe before expensive log message
  * generation (buffer dumps).  */
 typedef int (*assuan_log_cb_t) (assuan_context_t ctx, void *hook,
 				unsigned int cat, const char *msg);
 
 /* Return or check the version number.  */
 const char *assuan_check_version (const char *req_version);
 
 /* Set the default gpg error source.  */
 void assuan_set_gpg_err_source (gpg_err_source_t errsource);
 
 /* Get the default gpg error source.  */
 gpg_err_source_t assuan_get_gpg_err_source (void);
 
 
 /* Set the default malloc hooks.  */
 void assuan_set_malloc_hooks (assuan_malloc_hooks_t malloc_hooks);
 
 /* Get the default malloc hooks.  */
 assuan_malloc_hooks_t assuan_get_malloc_hooks (void);
 
 
 /* Set the default log callback handler.  */
 void assuan_set_log_cb (assuan_log_cb_t log_cb, void *log_cb_data);
 
 /* Get the default log callback handler.  */
 void assuan_get_log_cb (assuan_log_cb_t *log_cb, void **log_cb_data);
 
 
 /* Create a new Assuan context.  The initial parameters are all needed
  * in the creation of the context.  */
 gpg_error_t assuan_new_ext (assuan_context_t *ctx, gpg_err_source_t errsource,
 			    assuan_malloc_hooks_t malloc_hooks,
 			    assuan_log_cb_t log_cb, void *log_cb_data);
 
 /* Create a new context with default arguments.  */
 gpg_error_t assuan_new (assuan_context_t *ctx);
 
 /* Release all resources associated with the given context.  */
 void assuan_release (assuan_context_t ctx);
 
 /* Release the memory at PTR using the allocation handler of the
  * context CTX.  This is a convenience function.  */
 void assuan_free (assuan_context_t ctx, void *ptr);
 
 
 /* Set user-data in a context.  */
 void assuan_set_pointer (assuan_context_t ctx, void *pointer);
 
 /* Get user-data in a context.  */
 void *assuan_get_pointer (assuan_context_t ctx);
 
 
 /* Definitions of flags for assuan_set_flag().  */
 typedef unsigned int assuan_flag_t;
 
 /* When using a pipe server, by default Assuan will wait for the
  * forked process to die in assuan_release.  In certain cases this
  * is not desirable.  By setting this flag, the waitpid will be
  * skipped and the caller is responsible to cleanup a forked
  * process. */
 #define ASSUAN_NO_WAITPID 1
 
 /* This flag indicates whether Assuan logging is in confidential mode.
    You can use assuan_{begin,end}_condidential to change the mode.  */
 #define ASSUAN_CONFIDENTIAL 2
 
 /* This flag suppresses fix up of signal handlers for pipes.  */
 #define ASSUAN_NO_FIXSIGNALS 3
 
 /* This flag changes assuan_transact to return comment lines via the
  * status callback.  The default is to skip comment lines.  */
 #define ASSUAN_CONVEY_COMMENTS 4
 
 /* This flag disables logging for one context.  */
 #define ASSUAN_NO_LOGGING 5
 
 /* This flag forces a connection close.  */
 #define ASSUAN_FORCE_CLOSE 6
 
 
 /* For context CTX, set the flag FLAG to VALUE.  Values for flags
  * are usually 1 or 0 but certain flags might allow for other values;
  * see the description of the type assuan_flag_t for details.  */
 void assuan_set_flag (assuan_context_t ctx, assuan_flag_t flag, int value);
 
 /* Return the VALUE of FLAG in context CTX.  */
 int assuan_get_flag (assuan_context_t ctx, assuan_flag_t flag);
 
 /* Same as assuan_set_flag (ctx, ASSUAN_CONFIDENTIAL, 1).  */
 void assuan_begin_confidential (assuan_context_t ctx);
 
 /* Same as assuan_set_flag (ctx, ASSUAN_CONFIDENTIAL, 0).  */
 void assuan_end_confidential (assuan_context_t ctx);
 
 
 /* Direction values for assuan_set_io_monitor.  */
 #define ASSUAN_IO_FROM_PEER 0
 #define ASSUAN_IO_TO_PEER 1
 
 /* Return flags of I/O monitor.  */
 #define ASSUAN_IO_MONITOR_NOLOG 1
 #define ASSUAN_IO_MONITOR_IGNORE 2
 
 /* The IO monitor gets to see all I/O on the context, and can return
  * ASSUAN_IO_MONITOR_* bits to control actions on it.  */
 typedef unsigned int (*assuan_io_monitor_t) (assuan_context_t ctx, void *hook,
 					     int inout, const char *line,
 					     size_t linelen);
 
 /* Set the IO monitor function.  */
 void assuan_set_io_monitor (assuan_context_t ctx,
 			    assuan_io_monitor_t io_monitor, void *hook_data);
 
 /* The system hooks.  See assuan_set_system_hooks et al. */
 #define ASSUAN_SYSTEM_HOOKS_VERSION 2
 #define ASSUAN_SPAWN_DETACHED 128
 struct assuan_system_hooks
 {
   /* Always set to ASSUAN_SYTEM_HOOKS_VERSION.  */
   int version;
 
   /* Sleep for the given number of microseconds.  */
   void (*usleep) (assuan_context_t ctx, unsigned int usec);
 
   /* Create a pipe with an inheritable end.  */
   int (*pipe) (assuan_context_t ctx, assuan_fd_t fd[2], int inherit_idx);
 
  /* Close the given file descriptor, created with _assuan_pipe or one
    of the socket functions.  */
   int (*close) (assuan_context_t ctx, assuan_fd_t fd);
 
 
   ssize_t (*read) (assuan_context_t ctx, assuan_fd_t fd, void *buffer,
 		   size_t size);
   ssize_t (*write) (assuan_context_t ctx, assuan_fd_t fd,
 		    const void *buffer, size_t size);
 
   int (*recvmsg) (assuan_context_t ctx, assuan_fd_t fd, assuan_msghdr_t msg,
 		  int flags);
   int (*sendmsg) (assuan_context_t ctx, assuan_fd_t fd,
 		  const assuan_msghdr_t msg, int flags);
 
   /* If NAME is NULL, don't exec, just fork.  FD_CHILD_LIST is
      modified to reflect the value of the FD in the peer process (on
      Windows).  */
   int (*spawn) (assuan_context_t ctx, assuan_pid_t *r_pid, const char *name,
 		const char **argv,
 		assuan_fd_t fd_in, assuan_fd_t fd_out,
 		assuan_fd_t *fd_child_list,
 		void (*atfork) (void *opaque, int reserved),
 		void *atforkvalue, unsigned int flags);
 
   /* If action is 0, like waitpid.  If action is 1, just release the PID?  */
   assuan_pid_t (*waitpid) (assuan_context_t ctx, assuan_pid_t pid,
                            int action, int *status, int options);
   int (*socketpair) (assuan_context_t ctx, int _namespace, int style,
 		     int protocol, assuan_fd_t filedes[2]);
   assuan_fd_t (*socket) (assuan_context_t ctx, int _namespace,
                          int style, int protocol);
   int (*connect) (assuan_context_t ctx, assuan_fd_t sock,
                   struct sockaddr *addr, socklen_t length);
 };
 typedef struct assuan_system_hooks *assuan_system_hooks_t;
 
 
 
 /*
  * Configuration of the default log handler.
  */
 
 /* Set the prefix to be used at the start of a line emitted by assuan
  * on the log stream.  The default is the empty string.  Note, that
  * this function is not thread-safe and should in general be used
  * right at startup. */
 void assuan_set_assuan_log_prefix (const char *text);
 
 /* Return a prefix to be used at the start of a line emitted by assuan
  * on the log stream.  The default implementation returns the empty
  * string, i.e. "".  */
 const char *assuan_get_assuan_log_prefix (void);
 
 /* Global default log stream.  */
 void assuan_set_assuan_log_stream (FILE *fp);
 
 /* Set the per context log stream for the default log handler.  */
 void assuan_set_log_stream (assuan_context_t ctx, FILE *fp);
 
 
 /* The type for assuan command handlers.  */
 typedef gpg_error_t (*assuan_handler_t) (assuan_context_t, char *);
 
 /*-- assuan-handler.c --*/
 gpg_error_t assuan_register_command (assuan_context_t ctx,
 				     const char *cmd_string,
 				     assuan_handler_t handler,
                                      const char *help_string);
 gpg_error_t assuan_register_pre_cmd_notify (assuan_context_t ctx,
                                           gpg_error_t (*fnc)(assuan_context_t,
                                                              const char *cmd));
 
 gpg_error_t assuan_register_post_cmd_notify (assuan_context_t ctx,
 					     void (*fnc)(assuan_context_t,
                                                          gpg_error_t));
 gpg_error_t assuan_register_bye_notify (assuan_context_t ctx,
 					assuan_handler_t handler);
 gpg_error_t assuan_register_reset_notify (assuan_context_t ctx,
 					  assuan_handler_t handler);
 gpg_error_t assuan_register_cancel_notify (assuan_context_t ctx,
 					   assuan_handler_t handler);
 gpg_error_t assuan_register_input_notify (assuan_context_t ctx,
 					  assuan_handler_t handler);
 gpg_error_t assuan_register_output_notify (assuan_context_t ctx,
 					   assuan_handler_t handler);
 
 gpg_error_t assuan_register_option_handler (assuan_context_t ctx,
 					    gpg_error_t (*fnc)(assuan_context_t,
 							       const char*,
                                                                const char*));
 
 gpg_error_t assuan_process (assuan_context_t ctx);
 gpg_error_t assuan_process_next (assuan_context_t ctx, int *done);
 gpg_error_t assuan_process_done (assuan_context_t ctx, gpg_error_t rc);
 int assuan_get_active_fds (assuan_context_t ctx, int what,
                            assuan_fd_t *fdarray, int fdarraysize);
 
 const char *assuan_get_command_name (assuan_context_t ctx);
 
 FILE *assuan_get_data_fp (assuan_context_t ctx);
 gpg_error_t assuan_set_okay_line (assuan_context_t ctx, const char *line);
 gpg_error_t assuan_write_status (assuan_context_t ctx,
 				 const char *keyword, const char *text);
 
 /* Negotiate a file descriptor.  If LINE contains "FD=N", returns N
  * assuming a local file descriptor.  If LINE contains "FD" reads a
  * file descriptor via CTX and stores it in *RDF (the CTX must be
  * capable of passing file descriptors).  Under Windows the returned
  * FD is a libc-type one.  */
 gpg_error_t assuan_command_parse_fd (assuan_context_t ctx, char *line,
                                         assuan_fd_t *rfd);
 
 
 /*-- assuan-listen.c --*/
 gpg_error_t assuan_set_hello_line (assuan_context_t ctx, const char *line);
 gpg_error_t assuan_accept (assuan_context_t ctx);
 assuan_fd_t assuan_get_input_fd (assuan_context_t ctx);
 assuan_fd_t assuan_get_output_fd (assuan_context_t ctx);
 gpg_error_t assuan_close_input_fd (assuan_context_t ctx);
 gpg_error_t assuan_close_output_fd (assuan_context_t ctx);
 
 
 /*-- assuan-pipe-server.c --*/
 gpg_error_t assuan_init_pipe_server (assuan_context_t ctx,
 				     assuan_fd_t filedes[2]);
 
 /*-- assuan-socket-server.c --*/
 #define ASSUAN_SOCKET_SERVER_FDPASSING 1
 #define ASSUAN_SOCKET_SERVER_ACCEPTED 2
 gpg_error_t assuan_init_socket_server (assuan_context_t ctx,
 				       assuan_fd_t listen_fd,
 				       unsigned int flags);
 void assuan_set_sock_nonce (assuan_context_t ctx, assuan_sock_nonce_t *nonce);
 
 /*-- assuan-pipe-connect.c --*/
 #define ASSUAN_PIPE_CONNECT_FDPASSING 1
 #define ASSUAN_PIPE_CONNECT_DETACHED 128
 gpg_error_t assuan_pipe_connect (assuan_context_t ctx,
 				 const char *name,
 				 const char *argv[],
 				 assuan_fd_t *fd_child_list,
 				 void (*atfork) (void *, int),
 				 void *atforkvalue,
 				 unsigned int flags);
 
 /*-- assuan-socket-connect.c --*/
 #define ASSUAN_SOCKET_CONNECT_FDPASSING 1
 gpg_error_t assuan_socket_connect (assuan_context_t ctx, const char *name,
 				   pid_t server_pid, unsigned int flags);
 
 /*-- assuan-socket-connect.c --*/
 gpg_error_t assuan_socket_connect_fd (assuan_context_t ctx, assuan_fd_t fd,
 				   unsigned int flags);
 
 /*-- context.c --*/
 pid_t assuan_get_pid (assuan_context_t ctx);
 struct _assuan_peercred
 {
 #ifdef _WIN32
   /* Empty struct not allowed on some compilers, so, put this (not valid).  */
   pid_t pid;
 #else
   pid_t pid;
   uid_t uid;
   gid_t gid;
 #endif
 };
 typedef struct _assuan_peercred *assuan_peercred_t;
 
 gpg_error_t assuan_get_peercred (assuan_context_t ctx,
 				 assuan_peercred_t *peercred);
 
 
 
 /*
  * Client interface.
  */
 
 /* Client response codes.  */
 #define ASSUAN_RESPONSE_ERROR 0
 #define ASSUAN_RESPONSE_OK 1
 #define ASSUAN_RESPONSE_DATA 2
 #define ASSUAN_RESPONSE_INQUIRE 3
 #define ASSUAN_RESPONSE_STATUS 4
 #define ASSUAN_RESPONSE_END 5
 #define ASSUAN_RESPONSE_COMMENT 6
 typedef int assuan_response_t;
 
 /* This already de-escapes data lines.  */
 gpg_error_t assuan_client_read_response (assuan_context_t ctx,
 					 char **line, int *linelen);
 
 gpg_error_t assuan_client_parse_response (assuan_context_t ctx,
 					  char *line, int linelen,
 					  assuan_response_t *response,
 					  int *off);
 
 /*-- assuan-client.c --*/
 gpg_error_t
 assuan_transact (assuan_context_t ctx,
                  const char *command,
                  gpg_error_t (*data_cb)(void *, const void *, size_t),
                  void *data_cb_arg,
                  gpg_error_t (*inquire_cb)(void*, const char *),
                  void *inquire_cb_arg,
                  gpg_error_t (*status_cb)(void*, const char *),
                  void *status_cb_arg);
 
 
 /*-- assuan-inquire.c --*/
 gpg_error_t assuan_inquire (assuan_context_t ctx, const char *keyword,
                                unsigned char **r_buffer, size_t *r_length,
                                size_t maxlen);
 gpg_error_t assuan_inquire_ext (assuan_context_t ctx, const char *keyword,
 				size_t maxlen,
 				gpg_error_t (*cb) (void *cb_data,
 						   gpg_error_t rc,
 						   unsigned char *buf,
 						   size_t buf_len),
 				void *cb_data);
 /*-- assuan-buffer.c --*/
 gpg_error_t assuan_read_line (assuan_context_t ctx,
                               char **line, size_t *linelen);
 int assuan_pending_line (assuan_context_t ctx);
 gpg_error_t assuan_write_line (assuan_context_t ctx, const char *line);
 gpg_error_t assuan_send_data (assuan_context_t ctx,
                               const void *buffer, size_t length);
 
 /* The file descriptor must be pending before assuan_receivefd is
  * called.  This means that assuan_sendfd should be called *before* the
  * trigger is sent (normally via assuan_write_line ("INPUT FD")).  */
 gpg_error_t assuan_sendfd (assuan_context_t ctx, assuan_fd_t fd);
 gpg_error_t assuan_receivefd (assuan_context_t ctx, assuan_fd_t *fd);
 
 
 /*-- assuan-util.c --*/
 gpg_error_t assuan_set_error (assuan_context_t ctx, gpg_error_t err,
 			      const char *text);
 
 
 
 /*-- assuan-socket.c --*/
 
 /* This flag is used with assuan_sock_connect_byname to
  * connect via SOCKS.  */
 #define ASSUAN_SOCK_SOCKS   1
 
 /* This flag is used with assuan_sock_connect_byname to force a
    connection via Tor even if the socket subsystem has not been
    swicthed into Tor mode.  This flags overrides ASSUAN_SOCK_SOCKS. */
 #define ASSUAN_SOCK_TOR     2
 
 /* These are socket wrapper functions to support an emulation of Unix
  * domain sockets on Windows.  */
 gpg_error_t assuan_sock_init (void);
 void assuan_sock_deinit (void);
 int assuan_sock_close (assuan_fd_t fd);
 assuan_fd_t assuan_sock_new (int domain, int type, int proto);
 int assuan_sock_set_flag (assuan_fd_t sockfd, const char *name, int value);
 int assuan_sock_get_flag (assuan_fd_t sockfd, const char *name, int *r_value);
 assuan_fd_t assuan_sock_accept (assuan_fd_t sockfd,
                                 struct sockaddr *addr, socklen_t *p_addrlen);
 int assuan_sock_connect (assuan_fd_t sockfd,
                          struct sockaddr *addr, int addrlen);
 assuan_fd_t assuan_sock_connect_byname (const char *host, unsigned short port,
                                         int timeout,
                                         const char *credentials,
                                         unsigned int flags);
 int assuan_sock_bind (assuan_fd_t sockfd, struct sockaddr *addr, int addrlen);
 int assuan_sock_set_sockaddr_un (const char *fname, struct sockaddr *addr,
                                  int *r_redirected);
 int assuan_sock_get_nonce (struct sockaddr *addr, int addrlen,
                            assuan_sock_nonce_t *nonce);
 int assuan_sock_check_nonce (assuan_fd_t fd, assuan_sock_nonce_t *nonce);
 void assuan_sock_set_system_hooks (assuan_system_hooks_t system_hooks);
 
 
 /* Set the default system callbacks.  This is irreversible.  */
 void assuan_set_system_hooks (assuan_system_hooks_t system_hooks);
 
 /* Set the per context system callbacks.  This is irreversible.  */
 void assuan_ctx_set_system_hooks (assuan_context_t ctx,
 				  assuan_system_hooks_t system_hooks);
 
 /* Change the system hooks for the socket interface.
  * This is not thread-safe.  */
 void assuan_sock_set_system_hooks (assuan_system_hooks_t system_hooks);
 
 void __assuan_usleep (assuan_context_t ctx, unsigned int usec);
 int __assuan_pipe (assuan_context_t ctx, assuan_fd_t fd[2], int inherit_idx);
 int __assuan_close (assuan_context_t ctx, assuan_fd_t fd);
 int __assuan_spawn (assuan_context_t ctx, assuan_pid_t *r_pid, const char *name,
 		    const char **argv, assuan_fd_t fd_in, assuan_fd_t fd_out,
                     assuan_fd_t *fd_child_list,
                     void (*atfork) (void *opaque, int reserved),
                     void *atforkvalue, unsigned int flags);
 int __assuan_socketpair (assuan_context_t ctx, int _namespace, int style,
                          int protocol, assuan_fd_t filedes[2]);
 assuan_fd_t __assuan_socket (assuan_context_t ctx, int _namespace,
                              int style, int protocol);
 int __assuan_connect (assuan_context_t ctx, assuan_fd_t sock,
                       struct sockaddr *addr, socklen_t length);
 ssize_t __assuan_read (assuan_context_t ctx, assuan_fd_t fd,
                        void *buffer, size_t size);
 ssize_t __assuan_write (assuan_context_t ctx, assuan_fd_t fd,
                         const void *buffer, size_t size);
 int __assuan_recvmsg (assuan_context_t ctx, assuan_fd_t fd,
                       assuan_msghdr_t msg, int flags);
 int __assuan_sendmsg (assuan_context_t ctx, assuan_fd_t fd,
                       const assuan_msghdr_t msg, int flags);
 assuan_pid_t __assuan_waitpid (assuan_context_t ctx, assuan_pid_t pid,
                                int nowait, int *status, int options);
 
-#ifdef ASSUAN_REALLY_REQUIRE_OLD_WAY_OF_SYSTEM_NPTH
+#if defined(LIBASSUAN_API_REQUESTED) && LIBASSUAN_API_REQUESTED >= 3
+#defined ASSUAN_NO_GLOBAL_SYSTEM_HOOKS_ANY_MORE 1
+#endif
+
+#if defined(ASSUAN_REALLY_REQUIRE_OLD_WAY_OF_SYSTEM_NPTH) \
+    || !defined(ASSUAN_NO_GLOBAL_SYSTEM_HOOKS_ANY_MORE)
 /* Standard system hooks for nPth.  */
 #define ASSUAN_SYSTEM_NPTH_IMPL						\
   static void _assuan_npth_usleep (assuan_context_t ctx, unsigned int usec) \
   { npth_unprotect();				                        \
     __assuan_usleep (ctx, usec);					\
     npth_protect(); }							\
   static ssize_t _assuan_npth_read (assuan_context_t ctx, assuan_fd_t fd, \
 				    void *buffer, size_t size)		\
   { ssize_t res; (void) ctx; npth_unprotect();				\
     res = __assuan_read (ctx, fd, buffer, size);			\
     npth_protect(); return res; }					\
   static ssize_t _assuan_npth_write (assuan_context_t ctx, assuan_fd_t fd, \
 				     const void *buffer, size_t size)	\
   { ssize_t res; (void) ctx; npth_unprotect();				\
     res = __assuan_write (ctx, fd, buffer, size);			\
     npth_protect(); return res; }					\
   static int _assuan_npth_recvmsg (assuan_context_t ctx, assuan_fd_t fd, \
 				  assuan_msghdr_t msg, int flags)	\
   { int res; (void) ctx; npth_unprotect();				\
     res = __assuan_recvmsg (ctx, fd, msg, flags);			\
     npth_protect(); return res; }					\
   static int _assuan_npth_sendmsg (assuan_context_t ctx, assuan_fd_t fd, \
 				  const assuan_msghdr_t msg, int flags) \
   { int res; (void) ctx; npth_unprotect();				\
     res = __assuan_sendmsg (ctx, fd, msg, flags);			\
     npth_protect(); return res; }					\
   static assuan_pid_t _assuan_npth_waitpid (assuan_context_t ctx,         \
                                             assuan_pid_t pid, int nowait, \
                                             int *status, int options)     \
   { assuan_pid_t res; (void) ctx; npth_unprotect();			\
     res = __assuan_waitpid (ctx, pid, nowait, status, options);		\
     npth_protect(); return res; }					\
   static int _assuan_npth_connect (assuan_context_t ctx, assuan_fd_t sock, \
 				   struct sockaddr *addr, socklen_t len)\
   { int res; npth_unprotect();						\
     res = __assuan_connect (ctx, sock, addr, len);			\
     npth_protect(); return res; }					\
   static int _assuan_npth_close (assuan_context_t ctx, assuan_fd_t fd)	\
   { int res; npth_unprotect();						\
     res = __assuan_close (ctx, fd);					\
     npth_protect(); return res; }					\
 									\
   struct assuan_system_hooks _assuan_system_npth =			\
     { ASSUAN_SYSTEM_HOOKS_VERSION, _assuan_npth_usleep, __assuan_pipe,	\
       _assuan_npth_close, _assuan_npth_read, _assuan_npth_write,	\
       _assuan_npth_recvmsg, _assuan_npth_sendmsg,			\
       __assuan_spawn, _assuan_npth_waitpid, __assuan_socketpair,	\
       __assuan_socket, _assuan_npth_connect }
 
 extern struct assuan_system_hooks _assuan_system_npth;
 #define ASSUAN_SYSTEM_NPTH &_assuan_system_npth
 #else
 #define ASSUAN_SYSTEM_NPTH_IMPL /**/
 #define ASSUAN_SYSTEM_NPTH NULL
 #endif
 
 #ifdef __cplusplus
 }
 #endif
 #endif /* ASSUAN_H */
diff --git a/src/libassuan.m4 b/src/libassuan.m4
index 79391bb..f9e2e4f 100644
--- a/src/libassuan.m4
+++ b/src/libassuan.m4
@@ -1,172 +1,173 @@
 dnl Autoconf macros for libassuan
 dnl Copyright (C) 2002, 2003, 2011 Free Software Foundation, Inc.
 dnl
 dnl This file is free software; as a special exception the author gives
 dnl unlimited permission to copy and/or distribute it, with or without
 dnl modifications, as long as this notice is preserved.
 dnl
 dnl This file is distributed in the hope that it will be useful, but
 dnl WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 dnl implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 dnl SPDX-License-Identifier: FSFULLR
 # Last-changed: 2022-11-01
 
 dnl
 dnl Common code used for libassuan detection [internal]
 dnl Returns ok set to yes or no.
 dnl
 AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON],
 [ AC_REQUIRE([AC_CANONICAL_HOST])
   AC_ARG_WITH(libassuan-prefix,
               AS_HELP_STRING([--with-libassuan-prefix=PFX],
                              [prefix where LIBASSUAN is installed (optional)]),
      libassuan_config_prefix="$withval", libassuan_config_prefix="")
   if test x$libassuan_config_prefix != x ; then
     if test x${LIBASSUAN_CONFIG+set} != xset ; then
       LIBASSUAN_CONFIG=$libassuan_config_prefix/bin/libassuan-config
     fi
   fi
 
   use_gpgrt_config=""
   if test x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then
     if $GPGRT_CONFIG libassuan --exists; then
       LIBASSUAN_CONFIG="$GPGRT_CONFIG libassuan"
       AC_MSG_NOTICE([Use gpgrt-config as libassuan-config])
       use_gpgrt_config=yes
     fi
   fi
   if test -z "$use_gpgrt_config"; then
     AC_PATH_PROG(LIBASSUAN_CONFIG, libassuan-config, no)
   fi
 
   tmp=ifelse([$1], ,1:0.9.2,$1)
   if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then
     req_libassuan_api=`echo "$tmp"     | sed 's/\(.*\):\(.*\)/\1/'`
     min_libassuan_version=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\2/'`
   else
     req_libassuan_api=0
     min_libassuan_version="$tmp"
   fi
 
   AC_MSG_CHECKING(for LIBASSUAN - version >= $min_libassuan_version)
   ok=no
   if test "$LIBASSUAN_CONFIG" != "no"; then
     req_major=`echo $min_libassuan_version | \
                sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
     req_minor=`echo $min_libassuan_version | \
                sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
     req_micro=`echo $min_libassuan_version | \
                sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
 
     if test -z "$use_gpgrt_config"; then
       libassuan_config_version=`$LIBASSUAN_CONFIG --version`
     else
       libassuan_config_version=`$LIBASSUAN_CONFIG --modversion`
     fi
     major=`echo $libassuan_config_version | \
                sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
     minor=`echo $libassuan_config_version | \
                sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'`
     micro=`echo $libassuan_config_version | \
                sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'`
 
     if test "$major" -gt "$req_major"; then
         ok=yes
     else
         if test "$major" -eq "$req_major"; then
             if test "$minor" -gt "$req_minor"; then
                ok=yes
             else
                if test "$minor" -eq "$req_minor"; then
                    if test "$micro" -ge "$req_micro"; then
                      ok=yes
                    fi
                fi
             fi
         fi
     fi
   fi
 
   if test $ok = yes; then
     AC_MSG_RESULT([yes ($libassuan_config_version)])
+    AC_DEFINE(LIBASSUAN_API_REQUESTED, $req_libassuan_api, Requested API version for libassuan)
   else
     AC_MSG_RESULT(no)
   fi
 
   if test $ok = yes; then
     if test "$req_libassuan_api" -gt 0 ; then
       if test -z "$use_gpgrt_config"; then
         tmp=`$LIBASSUAN_CONFIG --api-version 2>/dev/null || echo 0`
       else
         tmp=`$LIBASSUAN_CONFIG --variable=api_version 2>/dev/null || echo 0`
       fi
       if test "$tmp" -gt 0 ; then
         AC_MSG_CHECKING([LIBASSUAN API version])
         if test "$req_libassuan_api" -eq "$tmp" ; then
           AC_MSG_RESULT(okay)
         else
           ok=no
           AC_MSG_RESULT([does not match.  want=$req_libassuan_api got=$tmp.])
         fi
       fi
     fi
   fi
 
   if test $ok = yes; then
     if test x"$host" != x ; then
       if test -z "$use_gpgrt_config"; then
         libassuan_config_host=`$LIBASSUAN_CONFIG --host 2>/dev/null || echo none`
       else
         libassuan_config_host=`$LIBASSUAN_CONFIG --variable=host 2>/dev/null || echo none`
       fi
       if test x"$libassuan_config_host" != xnone ; then
         if test x"$libassuan_config_host" != x"$host" ; then
   AC_MSG_WARN([[
 ***
 *** The config script "$LIBASSUAN_CONFIG" was
 *** built for $libassuan_config_host and thus may not match the
 *** used host $host.
 *** You may want to use the configure option --with-libassuan-prefix
 *** to specify a matching config script.
 ***]])
         fi
       fi
     fi
   fi
 ])
 
 dnl AM_CHECK_LIBASSUAN([MINIMUM-VERSION,
 dnl                    [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
 dnl Test whether libassuan has at least MINIMUM-VERSION. This is
 dnl used to test for features only available in newer versions.
 dnl
 AC_DEFUN([AM_CHECK_LIBASSUAN],
 [ _AM_PATH_LIBASSUAN_COMMON($1)
   if test $ok = yes; then
     ifelse([$2], , :, [$2])
   else
     ifelse([$3], , :, [$3])
   fi
 ])
 
 
 
 
 dnl AM_PATH_LIBASSUAN([MINIMUM-VERSION,
 dnl                   [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
 dnl Test for libassuan and define LIBASSUAN_CFLAGS and LIBASSUAN_LIBS
 dnl
 AC_DEFUN([AM_PATH_LIBASSUAN],
 [ _AM_PATH_LIBASSUAN_COMMON($1)
   if test $ok = yes; then
     LIBASSUAN_CFLAGS=`$LIBASSUAN_CONFIG --cflags`
     LIBASSUAN_LIBS=`$LIBASSUAN_CONFIG --libs`
     ifelse([$2], , :, [$2])
   else
     LIBASSUAN_CFLAGS=""
     LIBASSUAN_LIBS=""
     ifelse([$3], , :, [$3])
   fi
   AC_SUBST(LIBASSUAN_CFLAGS)
   AC_SUBST(LIBASSUAN_LIBS)
 ])