summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--openbsd-compat/xcrypt.c7
2 files changed, 3 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 2050f121f..20ba88694 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,8 @@
6 mcc -> fcc; from Love Hörnquist Åstrand <lha@it.su.se> 6 mcc -> fcc; from Love Hörnquist Åstrand <lha@it.su.se>
7 otherwise the kerberos credentinal is stored in a memory cache 7 otherwise the kerberos credentinal is stored in a memory cache
8 in the privileged sshd. ok jabob@, hin@ (some time ago) 8 in the privileged sshd. ok jabob@, hin@ (some time ago)
9 - (dtucker) [openbsd-compat/xcrypt.c] Remove Cygwin #ifdef block (duplicate
10 in bsd-cygwin_util.h).
9 11
1020030808 1220030808
11 - (dtucker) [openbsd-compat/fake-rfc2553.h] Older Linuxes have AI_PASSIVE and 13 - (dtucker) [openbsd-compat/fake-rfc2553.h] Older Linuxes have AI_PASSIVE and
@@ -813,4 +815,4 @@
813 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. 815 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
814 Report from murple@murple.net, diagnosis from dtucker@zip.com.au 816 Report from murple@murple.net, diagnosis from dtucker@zip.com.au
815 817
816$Id: ChangeLog,v 1.2887 2003/08/11 12:55:36 dtucker Exp $ 818$Id: ChangeLog,v 1.2888 2003/08/11 13:00:33 dtucker Exp $
diff --git a/openbsd-compat/xcrypt.c b/openbsd-compat/xcrypt.c
index ec28b7ccb..882185718 100644
--- a/openbsd-compat/xcrypt.c
+++ b/openbsd-compat/xcrypt.c
@@ -55,13 +55,6 @@
55# include "md5crypt.h" 55# include "md5crypt.h"
56# endif 56# endif
57 57
58# ifdef HAVE_CYGWIN
59# undef ERROR
60# include <windows.h>
61# include <sys/cygwin.h>
62# define is_winnt (GetVersion() < 0x80000000)
63# endif
64
65char * 58char *
66xcrypt(const char *password, const char *salt) 59xcrypt(const char *password, const char *salt)
67{ 60{