diff options
| author | Marcus Brinkmann <[email protected]> | 2006-12-17 21:12:40 +0000 |
|---|---|---|
| committer | Marcus Brinkmann <[email protected]> | 2006-12-17 21:12:40 +0000 |
| commit | 13d2e5d1c769d82d05e47a3fe9733108fabd5f73 (patch) | |
| tree | 043da58743ab799790f4260fb74cc6ee9bc5d9ec /assuan | |
| parent | 2006-12-17 Marcus Brinkmann <[email protected]> (diff) | |
| download | gpgme-13d2e5d1c769d82d05e47a3fe9733108fabd5f73.tar.gz gpgme-13d2e5d1c769d82d05e47a3fe9733108fabd5f73.zip | |
2006-12-17 Marcus Brinkmann <[email protected]>
* configure.ac: Fix two typos in last change.
gpgme/
2006-12-17 Marcus Brinkmann <[email protected]>
* gpgme.c (gpgme_set_protocol): Shut down the engine when
switching protocols.
(gpgme_ctx_set_engine_info): Likewise for engine info.
* engine.h (_gpgme_engine_reset): New function prototype.
* engine.c (_gpgme_engine_reset): New function.
* engine-backend.h (struct engine_ops): New member RESET.
* rungpg.c (_gpgme_engine_ops_gpg): Add NULL for reset function.
* engine-gpgsm.c (_gpgme_engine_ops_gpgsm)
[USE_DESCRIPTOR_PASSING]: Add gpgsm_reset for reset.
(_gpgme_engine_ops_gpgsm) [!USE_DESCRIPTOR_PASSING]: Add NULL for
reset function.
(gpgsm_reset) [USE_DESCRIPTOR_PASSING]: New function.
* op-support.c (_gpgme_op_reset): Try to use the engine's reset
function if available.
* engine-gpgsm.c (gpgsm_new): Move code to dup status_fd to ...
(start): ... here.
* posix-io.c (_gpgme_io_recvmsg, _gpgme_io_sendmsg): New functions.
Diffstat (limited to 'assuan')
| -rw-r--r-- | assuan/assuan.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/assuan/assuan.h b/assuan/assuan.h index 4916d6fb..cdf0445a 100644 --- a/assuan/assuan.h +++ b/assuan/assuan.h @@ -75,6 +75,8 @@ int _gpgme_ath_accept (int s, struct sockaddr *addr, socklen_t *length_ptr); int _gpgme_ath_connect (int s, struct sockaddr *addr, socklen_t length); int _gpgme_ath_sendmsg (int s, const struct msghdr *msg, int flags); int _gpgme_ath_recvmsg (int s, struct msghdr *msg, int flags); +int _gpgme_io_sendmsg (int sock, const struct msghdr *msg, int flags); +int _gpgme_io_recvmsg (int sock, struct msghdr *msg, int flags); #endif /*!HAVE_W32_SYSTEM*/ #define read _gpgme_io_read @@ -83,8 +85,8 @@ int _gpgme_ath_recvmsg (int s, struct msghdr *msg, int flags); #define select _gpgme_ath_select #define accept _gpgme_ath_accept #define connect _gpgme_ath_connect -#define sendmsg _gpgme_ath_sendmsg -#define recvmsg _gpgme_ath_recvmsg +#define sendmsg _gpgme_io_sendmsg +#define recvmsg _gpgme_io_recvmsg #endif /*_ASSUAN_IN_GPGME_BUILD_ASSUAN*/ /**** End GPGME specific modifications. ******/ |