diff options
| author | phk <phk@FreeBSD.org> | 2004-12-06 20:31:08 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 2004-12-06 20:31:08 +0000 |
| commit | 0e7aaf24f78bb5d26f6da416918862ba9f7d6129 (patch) | |
| tree | e037119542ddaa7521ab77bb18da6c14a34a6c52 /sys/fs/smbfs/smbfs_vnops.c | |
| parent | b71fe4fc33f167c7c72d88c653e447240f4b332e (diff) | |
| download | FreeBSD-src-0e7aaf24f78bb5d26f6da416918862ba9f7d6129.zip FreeBSD-src-0e7aaf24f78bb5d26f6da416918862ba9f7d6129.tar.gz | |
Convert to nmount. Add omount compat.
Unpropagate the sm_args function into the runtime part.
Diffstat (limited to 'sys/fs/smbfs/smbfs_vnops.c')
| -rw-r--r-- | sys/fs/smbfs/smbfs_vnops.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sys/fs/smbfs/smbfs_vnops.c b/sys/fs/smbfs/smbfs_vnops.c index 7067ce8..51e4072 100644 --- a/sys/fs/smbfs/smbfs_vnops.c +++ b/sys/fs/smbfs/smbfs_vnops.c @@ -140,10 +140,9 @@ smbfs_access(ap) break; } } - mpmode = vp->v_type == VREG ? smp->sm_args.file_mode : - smp->sm_args.dir_mode; - return (vaccess(vp->v_type, mpmode, smp->sm_args.uid, - smp->sm_args.gid, ap->a_mode, ap->a_cred, NULL)); + mpmode = vp->v_type == VREG ? smp->sm_file_mode : smp->sm_dir_mode; + return (vaccess(vp->v_type, mpmode, smp->sm_uid, + smp->sm_gid, ap->a_mode, ap->a_cred, NULL)); } /* ARGSUSED */ @@ -363,7 +362,7 @@ smbfs_setattr(ap) if (vap->va_atime.tv_sec != VNOVAL) atime = &vap->va_atime; if (mtime != atime) { - if (ap->a_cred->cr_uid != VTOSMBFS(vp)->sm_args.uid && + if (ap->a_cred->cr_uid != VTOSMBFS(vp)->sm_uid && (error = suser_cred(ap->a_cred, SUSER_ALLOWJAIL)) && ((vap->va_vaflags & VA_UTIMES_NULL) == 0 || (error = VOP_ACCESS(vp, VWRITE, ap->a_cred, ap->a_td)))) |
