- (dtucker) [configure.ac sftp-client.c] DOTTIF is in fs/ffs/dir.h on at

   least dragonflybsd.

3 files changed, 14 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index e6a21cf7a..3a7315b25 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -117,6 +117,8 @@
      [regress/ssh2putty.sh]
      Add OpenBSD tag to make syncs easier
  - (dtucker) [regress/portnum.sh] Import new test.
+ - (dtucker) [configure.ac sftp-client.c] DOTTIF is in fs/ffs/dir.h on at
+   least dragonflybsd.
 
 20091002
  - (djm) [Makefile.in] Mention readconf.o in ssh-keysign's make deps.
diff --git a/configure.ac b/configure.ac
index ea9f1bb56..759047f10 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.427 2009/09/11 04:56:08 dtucker Exp $
+# $Id: configure.ac,v 1.428 2009/10/07 04:49:48 dtucker Exp $
 #
 # Copyright (c) 1999-2004 Damien Miller
 #
@@ -15,7 +15,7 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org)
-AC_REVISION($Revision: 1.427 $)
+AC_REVISION($Revision: 1.428 $)
 AC_CONFIG_SRCDIR([ssh.c])
 
 AC_CONFIG_HEADER(config.h)
@@ -1130,6 +1130,13 @@ int main(void){struct dirent d;exit(sizeof(d.d_name)<=sizeof(char));}
         ]
 )
 
+AC_CHECK_DECL(DTTOIF,
+  AC_DEFINE(DTTOIF_IN_FS_FFS_DIR_H, 1 , [DTTOIF macro in fs/ffs/dir.h]), ,
+  [
+#include <sys/types.h>
+#include <fs/ffs/dir.h>
+  ])
+
 AC_MSG_CHECKING([for /proc/pid/fd directory])
 if test -d "/proc/$$/fd" ; then
         AC_DEFINE(HAVE_PROC_PID, 1, [Define if you have /proc/$pid/fd])
diff --git a/sftp-client.c b/sftp-client.c
index cc4a5b15b..b49e81b91 100644
--- a/sftp-client.c
+++ b/sftp-client.c
@@ -37,6 +37,9 @@
 #include <sys/uio.h>
 
 #include <dirent.h>
+#ifdef DTTOIF_IN_FS_FFS_DIR_H
+# include <fs/ffs/dir.h>
+#endif
 #include <errno.h>
 #include <fcntl.h>
 #include <signal.h>