Module Name: src
Committed By: sborrill
Date: Fri Feb 17 16:01:28 UTC 2012
Modified Files:
src/sys/fs/smbfs [netbsd-5]: smbfs_vnops.c
Log Message:
Pull up the following revisions(s) (requested by njoly in ticket #1726):
sys/fs/smbfs/smbfs_vnops.c: revision 1.70
Directory open with NT_SMBS capability require the NOPEN bit to be set
too. Fixes directory listing on smbfs mounts.
To generate a diff of this commit:
cvs rdiff -u -r1.65 -r1.65.6.1 src/sys/fs/smbfs/smbfs_vnops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/fs/smbfs/smbfs_vnops.c
diff -u src/sys/fs/smbfs/smbfs_vnops.c:1.65 src/sys/fs/smbfs/smbfs_vnops.c:1.65.6.1
--- src/sys/fs/smbfs/smbfs_vnops.c:1.65 Tue Jun 24 17:04:11 2008
+++ src/sys/fs/smbfs/smbfs_vnops.c Fri Feb 17 16:01:28 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: smbfs_vnops.c,v 1.65 2008/06/24 17:04:11 cegger Exp $ */
+/* $NetBSD: smbfs_vnops.c,v 1.65.6.1 2012/02/17 16:01:28 sborrill Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -64,7 +64,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: smbfs_vnops.c,v 1.65 2008/06/24 17:04:11 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smbfs_vnops.c,v 1.65.6.1 2012/02/17 16:01:28 sborrill Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -229,11 +229,9 @@ smbfs_open(v)
return EACCES;
}
if (vp->v_type == VDIR) {
- if ((sv_caps & SMB_CAP_NT_SMBS) == 0) {
- np->n_flag |= NOPEN;
+ np->n_flag |= NOPEN;
+ if ((sv_caps & SMB_CAP_NT_SMBS) == 0)
return 0;
- }
-
goto do_open; /* skip 'modified' check */
}
