diff options
| author | jdolecek <jdolecek@pkgsrc.org> | 2003-02-18 11:25:57 +0000 |
|---|---|---|
| committer | jdolecek <jdolecek@pkgsrc.org> | 2003-02-18 11:25:57 +0000 |
| commit | 6376a67187adba2e8ece79d0c5b286a8d7da0284 (patch) | |
| tree | 6c334bbe4dd7fd850a0850aa955e408847902449 /net | |
| parent | 5ab6450cf4bc53264edac9f8a5b0c5fd5f88a3c9 (diff) | |
| download | pkgsrc-6376a67187adba2e8ece79d0c5b286a8d7da0284.tar.gz | |
open_file_shared(): when falling back to O_RDONLY open_file() call after
O_RDWR fails in fcbopen case, remember the errno from previous open_file()
call and set errno back to this value if the second open_file() call
fails too
this makes samba report EACCESS instead of confusing ENOENT if creation
of file fails due to insufficient permissions for SMBcreate/SMBmknew call
bump package revision
Diffstat (limited to 'net')
| -rw-r--r-- | net/samba/Makefile | 3 | ||||
| -rw-r--r-- | net/samba/distinfo | 3 | ||||
| -rw-r--r-- | net/samba/patches/patch-ar | 16 |
3 files changed, 20 insertions, 2 deletions
diff --git a/net/samba/Makefile b/net/samba/Makefile index 7d1bfd1e383..48fff010f51 100644 --- a/net/samba/Makefile +++ b/net/samba/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.93 2003/01/28 22:03:55 jlam Exp $ +# $NetBSD: Makefile,v 1.94 2003/02/18 11:25:57 jdolecek Exp $ .include "Makefile.common" +PKGREVISION= 1 MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.samba.org/ COMMENT= SMB/CIFS protocol server suite for UNIX diff --git a/net/samba/distinfo b/net/samba/distinfo index bc46181d6da..af11033405d 100644 --- a/net/samba/distinfo +++ b/net/samba/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.25 2002/12/13 08:37:09 martti Exp $ +$NetBSD: distinfo,v 1.26 2003/02/18 11:25:57 jdolecek Exp $ SHA1 (samba-2.2.7a.tar.bz2) = 0c8c61bc81dbad7517985d9044d6961089682b2e Size (samba-2.2.7a.tar.bz2) = 4370869 bytes @@ -12,3 +12,4 @@ SHA1 (patch-aj) = e2c5f7580a8c701b6bf35d0d3004f714f2c810cb SHA1 (patch-al) = 9507677d964044416802e91597c29310c61c9622 SHA1 (patch-ap) = cc0b3d73d0c7de4cd46e66b0d66b2c3bbaddeb41 SHA1 (patch-aq) = ea9cd9097cf91dd2b9f1acd9e6ff6f9445505774 +SHA1 (patch-ar) = 51f2ba2a0934022bff6df35ff849ed533504ee42 diff --git a/net/samba/patches/patch-ar b/net/samba/patches/patch-ar new file mode 100644 index 00000000000..b31a4100462 --- /dev/null +++ b/net/samba/patches/patch-ar @@ -0,0 +1,16 @@ +$NetBSD: patch-ar,v 1.1 2003/02/18 11:25:58 jdolecek Exp $ + +--- smbd/open.c.orig Tue Feb 18 11:59:26 2003 ++++ smbd/open.c Tue Feb 18 11:59:39 2003 +@@ -947,8 +947,11 @@ + fsp_open = open_file(fsp,conn,fname,psbuf,flags|flags2,mode,desired_access); + + if (!fsp_open && (flags == O_RDWR) && (errno != ENOENT) && fcbopen) { ++ int saved_errno = errno; + if((fsp_open = open_file(fsp,conn,fname,psbuf,O_RDONLY,mode,desired_access)) == True) + flags = O_RDONLY; ++ else ++ errno = saved_errno; + } + + if (!fsp_open) { |