diff options
Diffstat (limited to 'apps/xauth')
| -rw-r--r-- | apps/xauth/config.h | 94 | ||||
| -rw-r--r-- | apps/xauth/gethost.c | 5 | ||||
| -rw-r--r-- | apps/xauth/makefile | 22 | ||||
| -rw-r--r-- | apps/xauth/process.c | 2 |
4 files changed, 122 insertions, 1 deletions
diff --git a/apps/xauth/config.h b/apps/xauth/config.h new file mode 100644 index 000000000..8152de05a --- /dev/null +++ b/apps/xauth/config.h @@ -0,0 +1,94 @@ +/* config.h.in. Generated from configure.ac by autoheader. */ + +/* Define to 1 if `struct sockaddr_in' has a `sin_len' member */ +#undef BSD44SOCKETS + +/* Define to 1 if you have the <inttypes.h> header file. */ +#undef HAVE_INTTYPES_H + +/* Define to 1 if you have the `ws2_32' library (-lws2_32). */ +#undef HAVE_LIBWS2_32 + +/* Define to 1 if you have the <memory.h> header file. */ +#undef HAVE_MEMORY_H + +/* Define to 1 if you have the <net/errno.h> header file. */ +#undef HAVE_NET_ERRNO_H + +/* Define to 1 if the system has the type `socklen_t'. */ +#undef HAVE_SOCKLEN_T + +/* Define to 1 if you have the <stdint.h> header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the <stdlib.h> header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the <strings.h> header file. */ +#undef HAVE_STRINGS_H + +/* Define to 1 if you have the <string.h> header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the `strlcpy' function. */ +#undef HAVE_STRLCPY + +/* Define to 1 if you have the <sys/stat.h> header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the <sys/types.h> header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define to 1 if you have the <unistd.h> header file. */ +#define HAVE_UNISTD_H 1 + +/* Support IPv6 for TCP connections */ +#define IPv6 1 + +/* Support os-specific local connections */ +#undef LOCALCONN + +/* Name of package */ +#undef PACKAGE + +/* Define to the address where bug reports for this package should be sent. */ +#undef PACKAGE_BUGREPORT + +/* Define to the full name of this package. */ +#undef PACKAGE_NAME + +/* Define to the full name and version of this package. */ +#undef PACKAGE_STRING + +/* Define to the one symbol short name of this package. */ +#undef PACKAGE_TARNAME + +/* Define to the home page for this package. */ +#undef PACKAGE_URL + +/* Define to the version of this package. */ +#undef PACKAGE_VERSION + +/* Major version of this package */ +#undef PACKAGE_VERSION_MAJOR + +/* Minor version of this package */ +#undef PACKAGE_VERSION_MINOR + +/* Patch version of this package */ +#undef PACKAGE_VERSION_PATCHLEVEL + +/* Define as the return type of signal handlers (`int' or `void'). */ +#define RETSIGTYPE void + +/* Define to 1 if you have the ANSI C header files. */ +#undef STDC_HEADERS + +/* Support TCP socket connections */ +#define TCPCONN 1 + +/* Support UNIX socket connections */ +#undef UNIXCONN + +/* Version number of package */ +#undef VERSION diff --git a/apps/xauth/gethost.c b/apps/xauth/gethost.c index acac86478..cac6e9ec1 100644 --- a/apps/xauth/gethost.c +++ b/apps/xauth/gethost.c @@ -72,6 +72,11 @@ in this Software without prior written authorization from The Open Group. #ifndef WIN32 #include <arpa/inet.h> +#else +#if NTDDI_VERSION < NTDDI_VISTA +int inet_pton(int af, const char *src, void *dst); +const char *inet_ntop(int af, const void *src, char *dst, socklen_t cnt); +#endif #endif #ifdef SIGALRM diff --git a/apps/xauth/makefile b/apps/xauth/makefile new file mode 100644 index 000000000..d14cf9e35 --- /dev/null +++ b/apps/xauth/makefile @@ -0,0 +1,22 @@ +TTYAPP = xauth + +INCLUDELIBFILES = \ + ..\common\$(OBJDIR)\common.lib \ + $(MHMAKECONF)\libxcb\src\$(OBJDIR)\libxcb.lib \ + $(MHMAKECONF)\libXau\$(OBJDIR)\libXau.lib \ + $(MHMAKECONF)\libXmu\src\$(OBJDIR)\libXmu.lib \ + $(MHMAKECONF)\libXext\src\$(OBJDIR)\libXext.lib \ + $(MHMAKECONF)\libX11\$(OBJDIR)\libX11.lib + +LIBDIRS=$(dir $(INCLUDELIBFILES)) + +load_makefile $(LIBDIRS:%$(OBJDIR)\=%makefile MAKESERVER=0 DEBUG=$(DEBUG);) + +LINKLIBS += $(PTHREADLIB) + +CSRCS = \ + gethost.c \ + parsedpy.c \ + process.c \ + xauth.c + diff --git a/apps/xauth/process.c b/apps/xauth/process.c index a4021c7e6..f4f543cf8 100644 --- a/apps/xauth/process.c +++ b/apps/xauth/process.c @@ -810,7 +810,7 @@ write_auth_file(char *tmp_nam) (void) unlink (tmp_nam); /* CPhipps 2000/02/12 - fix file unlink/fopen race */ fd = open(tmp_nam, O_WRONLY | O_CREAT | O_EXCL, 0600); - if (fd != -1) fp = fdopen (fd, "wb"); + if (fd != -1) fp = _fdopen (fd, "wb"); if (!fp) { if (fd != -1) close(fd); fprintf (stderr, "%s: unable to open tmp file \"%s\"\n", |