Attachment 1082 Details for Bug 1161 – Same patch as #1081 autoconf-ed.

[patch] Same patch as #1081 autoconf-ed.

openssh-cygwin-scp.patch (text/plain), 1.24 KB, created by Darren Tucker on 2006-02-26 11:00:51 AEDT

(hide)

Description:

Filename:

MIME Type:

Creator: Darren Tucker

Created: 2006-02-26 11:00:51 AEDT

Size: 1.24 KB

patch

obsolete

>Index: configure.ac
>===================================================================
>RCS file: /usr/local/src/security/openssh/cvs/openssh_cvs/configure.ac,v
>retrieving revision 1.331
>diff -u -p -r1.331 configure.ac
>--- configure.ac	20 Feb 2006 09:17:36 -0000	1.331
>+++ configure.ac	25 Feb 2006 23:49:17 -0000
>@@ -958,6 +958,12 @@ int main(void){struct dirent d;exit(size
> 	]
> )
> 
>+AC_CHECK_MEMBERS(struct dirent.d_ino, [], [], [AC_LANG_SOURCE([[
>+#include <sys/types.h>
>+#include <dirent.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])
>Index: scp.c
>===================================================================
>RCS file: /usr/local/src/security/openssh/cvs/openssh_cvs/scp.c,v
>retrieving revision 1.144
>diff -u -p -r1.144 scp.c
>--- scp.c	31 Jan 2006 11:11:38 -0000	1.144
>+++ scp.c	25 Feb 2006 23:53:18 -0000
>@@ -695,8 +695,10 @@ rsource(char *name, struct stat *statp)
> 		return;
> 	}
> 	while ((dp = readdir(dirp)) != NULL) {
>+#ifdef HAVE_STRUCT_DIRENT_D_INO
> 		if (dp->d_ino == 0)
> 			continue;
>+#endif
> 		if (!strcmp(dp->d_name, ".") || !strcmp(dp->d_name, ".."))
> 			continue;
> 		if (strlen(name) + 1 + strlen(dp->d_name) >= sizeof(path) - 1) {

Actions: View | Diff

Attachments on bug 1161: 1079 | 1081 | 1082