summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2003-08-11 23:00:33 +1000
committerDarren Tucker <dtucker@zip.com.au>2003-08-11 23:00:33 +1000
commitbc8c8f36fbd430e3e041cf9bb70c10206058757c (patch)
tree0691fbeb26c2b24c1c8fbf03dadf5453ccd8e2fb
parentec0943a96c80c920bee584240a889ae7b619b4e8 (diff)
- (dtucker) [openbsd-compat/xcrypt.c] Remove Cygwin #ifdef block (duplicate
in bsd-cygwin_util.h).
-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 2050f121..20ba8869 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,8 @@
mcc -> fcc; from Love Hörnquist Åstrand <lha@it.su.se>
otherwise the kerberos credentinal is stored in a memory cache
in the privileged sshd. ok jabob@, hin@ (some time ago)
+ - (dtucker) [openbsd-compat/xcrypt.c] Remove Cygwin #ifdef block (duplicate
+ in bsd-cygwin_util.h).
20030808
- (dtucker) [openbsd-compat/fake-rfc2553.h] Older Linuxes have AI_PASSIVE and
@@ -813,4 +815,4 @@
- Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
Report from murple@murple.net, diagnosis from dtucker@zip.com.au
-$Id: ChangeLog,v 1.2887 2003/08/11 12:55:36 dtucker Exp $
+$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 ec28b7cc..88218571 100644
--- a/openbsd-compat/xcrypt.c
+++ b/openbsd-compat/xcrypt.c
@@ -55,13 +55,6 @@
# include "md5crypt.h"
# endif
-# ifdef HAVE_CYGWIN
-# undef ERROR
-# include <windows.h>
-# include <sys/cygwin.h>
-# define is_winnt (GetVersion() < 0x80000000)
-# endif
-
char *
xcrypt(const char *password, const char *salt)
{