merged OpenSSH 5.2p1 to trunk

[gssapi-openssh.git] / openssh / openbsd-compat / xcrypt.c

diff --git a/openssh/openbsd-compat/xcrypt.c b/openssh/openbsd-compat/xcrypt.c
index d8636bb398e107da73820616002f014d07d5445c..6291e2884c5c266478ff1a5733b8bedb1260eeab 100644 (file)
--- a/openssh/openbsd-compat/xcrypt.c
+++ b/openssh/openbsd-compat/xcrypt.c
@@ -28,7 +28,7 @@
 #include <unistd.h>
 #include <pwd.h>
 
-# ifdef HAVE_CRYPT_H
+# if defined(HAVE_CRYPT_H) && !defined(HAVE_SECUREWARE)
 #  include <crypt.h>
 # endif