Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Always do the chroot filename mapping; it is pointless not to do it.

Browse Source
This commit is contained in:
christos 2012-09-18 21:33:55 +00:00
parent e8ae3e9a41
commit 381769fc11
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/fs/ptyfs/ptyfs.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: ptyfs.h,v 1.8 2009/03/15 16:43:55 christos Exp $ */
/* $NetBSD: ptyfs.h,v 1.9 2012/09/18 21:33:55 christos Exp $ */
/*
* Copyright (c) 1993
@ -124,11 +124,6 @@ struct ptyfs_args {
#define PTYFS_ARGSVERSION 2
#define PTYFSMNT_CHROOT 0x01
#define PTYFSMNT_BITS "\177\20" \
"b\00chroot\0"
/*
* Kernel stuff follows
*/

7
sys/fs/ptyfs/ptyfs_vfsops.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ptyfs_vfsops.c,v 1.42 2010/01/08 11:35:09 pooka Exp $ */
/* $NetBSD: ptyfs_vfsops.c,v 1.43 2012/09/18 21:33:55 christos Exp $ */
/*
* Copyright (c) 1992, 1993, 1995
@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: ptyfs_vfsops.c,v 1.42 2010/01/08 11:35:09 pooka Exp $");
__KERNEL_RCSID(0, "$NetBSD: ptyfs_vfsops.c,v 1.43 2012/09/18 21:33:55 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -104,8 +104,7 @@ ptyfs__getpath(struct lwp *l, const struct mount *mp)
struct ptyfsmount *pmnt = mp->mnt_data;
rv = mp->mnt_stat.f_mntonname;
if (cwdi->cwdi_rdir == NULL ||
(pmnt->pmnt_flags & PTYFSMNT_CHROOT) == 0)
if (cwdi->cwdi_rdir == NULL)
return rv;
buf = malloc(MAXBUF, M_TEMP, M_WAITOK);