- (tim) [defines.h] Fix regression in long password support on OpenServer 6.

[openssh.git] / includes.h

diff --git a/includes.h b/includes.h
index 2101f13c9e299ab07c35e5f8bcdb67e5eb4f489c..9fcf1b023287c0965f0263086da78085cc666aee 100644 (file)
--- a/includes.h
+++ b/includes.h
@@ -30,7 +30,8 @@
 # include <bstring.h>
 #endif
 #if defined(HAVE_GLOB_H) && defined(GLOB_HAS_ALTDIRFUNC) && \
-    defined(GLOB_HAS_GL_MATCHC)
+    defined(GLOB_HAS_GL_MATCHC) && \
+    defined(HAVE_DECL_GLOB_NOMATCH) &&  HAVE_DECL_GLOB_NOMATCH != 0
 # include <glob.h>
 #endif
 #ifdef HAVE_ENDIAN_H
@@ -48,7 +49,7 @@
 #ifdef HAVE_NEXT
 # include <libc.h>
 #endif
-#ifdef HAVE_PATHS
+#ifdef HAVE_PATHS_H
 # include <paths.h>
 #endif