diff options
| author | Marcus Brinkmann <[email protected]> | 2007-07-08 15:46:10 +0000 |
|---|---|---|
| committer | Marcus Brinkmann <[email protected]> | 2007-07-08 15:46:10 +0000 |
| commit | 5b8e76a5334259a844ff973938b77d3e92e26f8b (patch) | |
| tree | c18fe477fd6f524214ed90f6127c043f43325abc /assuan/assuan-defs.h | |
| parent | 2007-07-04 Marcus Brinkmann <[email protected]> (diff) | |
| download | gpgme-5b8e76a5334259a844ff973938b77d3e92e26f8b.tar.gz gpgme-5b8e76a5334259a844ff973938b77d3e92e26f8b.zip | |
2007-07-08 Marcus Brinkmann <[email protected]>
* configure.ac (GPGSM_DEFAULT) [*-mingw32*]: Initialize it.
(HAVE_ASSUAN_H): Set to 1 if we have it.
(funopen): Use AC_REPLACE_FUNCS.
(USE_DESCRIPTOR_PASSING): Define to 1 if we have it. Do not
define it at all if we don't.
(NETLIBS) [have_w32_system]: Add -lws2_32.
(DIRSEP_C, DIRSEP_S, EXPSEP_C, EXPSEP_S, PATHSEP_S)
[HAVE_DOSISH_SYSTEM]: Remove definitions.
* assuan/assuan.h (_assuan_funopen): Define to _gpgme_funopen.
* assuan/funopen.c: Move to ../gpgme/funopen.c.
* assuan/Makefile.am (libassuan_la_SOURCES): Remove funopen.c.
assuan/
2007-07-08 Marcus Brinkmann <[email protected]>
* assuan-defs.h (struct assuan_context_s): Have partial peercred
structure even if HAVE_W32_SYSTEM, and have full peercred
structure only if HAVE_SO_PEERCRED.
* assuan-connect.c (assuan_get_peercred) [!HAVE_SO_PEERCRED]: Do
not try to set PID, UID and GID.
gpgme/
2007-07-08 Marcus Brinkmann <[email protected]>
* engine-gpgsm.c [HAVE_W32_SYSTEM]: Enable the bunch of the file.
* funopen.c (funopen): Rename to _gpgme_funopen.
Diffstat (limited to 'assuan/assuan-defs.h')
| -rw-r--r-- | assuan/assuan-defs.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/assuan/assuan-defs.h b/assuan/assuan-defs.h index 33cdfa3d..b1d9f3ef 100644 --- a/assuan/assuan-defs.h +++ b/assuan/assuan-defs.h @@ -140,14 +140,14 @@ struct assuan_context_s int listen_fd; /* The fd we are listening on (used by socket servers) */ int connected_fd; /* helper */ -#ifndef HAVE_W32_SYSTEM struct { int valid; /* Whether this structure has valid information. */ +#ifdef HAVE_SO_PEERCRED pid_t pid; /* The pid of the peer. */ uid_t uid; /* The uid of the peer. */ gid_t gid; /* The gid of the peer. */ +#endif /* HAVE_SO_PEERCRED */ } peercred; -#endif /* HAVE_W32_SYSTEM */ /* Used for Unix domain sockets. */ struct sockaddr_un myaddr; |