Module Name: src
Committed By: christos
Date: Mon Dec 19 03:02:31 UTC 2011
Modified Files:
src/sys/miscfs/procfs: procfs_linux.c
Log Message:
don't produce different output if we are super user.
To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.64 src/sys/miscfs/procfs/procfs_linux.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/miscfs/procfs/procfs_linux.c
diff -u src/sys/miscfs/procfs/procfs_linux.c:1.63 src/sys/miscfs/procfs/procfs_linux.c:1.64
--- src/sys/miscfs/procfs/procfs_linux.c:1.63 Fri Dec 16 15:45:07 2011
+++ src/sys/miscfs/procfs/procfs_linux.c Sun Dec 18 22:02:31 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: procfs_linux.c,v 1.63 2011/12/16 20:45:07 christos Exp $ */
+/* $NetBSD: procfs_linux.c,v 1.64 2011/12/19 03:02:31 christos Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: procfs_linux.c,v 1.63 2011/12/16 20:45:07 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: procfs_linux.c,v 1.64 2011/12/19 03:02:31 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -593,12 +593,9 @@ procfs_domounts(struct lwp *curl, struct
char *bf, *mtab = NULL;
size_t mtabsz = 0;
struct mount *mp, *nmp;
- int error = 0, suser, root = 0;
+ int error = 0, root = 0;
struct cwdinfo *cwdi = curl->l_proc->p_cwdi;
- suser = kauth_authorize_generic(curl->l_cred,
- KAUTH_GENERIC_ISSUSER, NULL) == 0;
-
bf = malloc(LBFSZ, M_TEMP, M_WAITOK);
mutex_enter(&mountlist_lock);
@@ -609,9 +606,9 @@ procfs_domounts(struct lwp *curl, struct
if (vfs_busy(mp, &nmp))
continue;
- if ((error = dostatvfs(mp, &sfs, curl, MNT_WAIT, suser)) == 0)
+ if ((error = dostatvfs(mp, &sfs, curl, MNT_WAIT, 0)) == 0)
root |= procfs_format_sfs(&mtab, &mtabsz, bf, LBFSZ,
- &sfs, curl, suser);
+ &sfs, curl, 0);
vfs_unbusy(mp, false, &nmp);
}
