Attachment 662 Details for Bug 823 – Handle Linux EPERM case

[patch] Handle Linux EPERM case

openssh-sftp-rename.patch (text/plain), 1.75 KB, created by Darren Tucker on 2004-06-25 17:30:39 AEST

(hide)

Description:

Filename:

MIME Type:

Creator: Darren Tucker

Created: 2004-06-25 17:30:39 AEST

Size: 1.75 KB

patch

obsolete

>Index: acconfig.h
>===================================================================
>RCS file: /var/cvs/openssh/acconfig.h,v
>retrieving revision 1.177
>diff -u -p -r1.177 acconfig.h
>--- acconfig.h	15 Apr 2004 23:22:40 -0000	1.177
>+++ acconfig.h	25 Jun 2004 07:24:15 -0000
>@@ -434,6 +434,12 @@
> /* Define if cmsg_type is not passed correctly */
> #undef BROKEN_CMSG_TYPE
> 
>+/*
>+ * Define to whatever link() returns for "not supported" if it doesn't
>+ * return EOPNOTSUPP.
>+ */
>+#undef LINK_OPNOTSUPP_ERRNO
>+
> /* Strings used in /etc/passwd to denote locked account */
> #undef LOCKED_PASSWD_STRING
> #undef LOCKED_PASSWD_PREFIX
>Index: configure.ac
>===================================================================
>RCS file: /var/cvs/openssh/configure.ac,v
>retrieving revision 1.222
>diff -u -p -r1.222 configure.ac
>--- configure.ac	25 Jun 2004 04:03:34 -0000	1.222
>+++ configure.ac	25 Jun 2004 07:24:16 -0000
>@@ -254,6 +254,7 @@ main() { if (NSVersionOfRunTimeLibrary("
> 	AC_DEFINE(PAM_TTY_KLUDGE)
> 	AC_DEFINE(LOCKED_PASSWD_PREFIX, "!")
> 	AC_DEFINE(SPT_TYPE,SPT_REUSEARGV)
>+	AC_DEFINE(LINK_OPNOTSUPP_ERRNO, EPERM)
> 	inet6_default_4in6=yes
> 	case `uname -r` in
> 	1.*|2.0.*)
>Index: sftp-server.c
>===================================================================
>RCS file: /var/cvs/openssh/sftp-server.c,v
>retrieving revision 1.54
>diff -u -p -r1.54 sftp-server.c
>--- sftp-server.c	25 Jun 2004 07:06:03 -0000	1.54
>+++ sftp-server.c	25 Jun 2004 07:24:17 -0000
>@@ -840,7 +840,11 @@ process_rename(void)
> 	else if (S_ISREG(sb.st_mode)) {
> 		/* Race-free rename of regular files */
> 		if (link(oldpath, newpath) == -1) {
>-			if (errno == EOPNOTSUPP) {
>+			if (errno == EOPNOTSUPP
>+#ifdef LINK_OPNOTSUPP_ERRNO
>+			    || errno == LINK_OPNOTSUPP_ERRNO
>+#endif
>+			    ) {
> 				struct stat st;
> 
> 				/*

Actions: View | Diff

Attachments on bug 823: 596 | 597 | 662