unify the location of *pcr in puffs_access_*
This commit is contained in:
parent
3a93377a23
commit
d28a42812b
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: creds.c,v 1.7 2007/03/22 15:48:42 pooka Exp $ */
|
||||
/* $NetBSD: creds.c,v 1.8 2007/03/22 16:57:27 pooka Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2006 Antti Kantee. All Rights Reserved.
|
||||
@ -32,7 +32,7 @@
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
#if !defined(lint)
|
||||
__RCSID("$NetBSD: creds.c,v 1.7 2007/03/22 15:48:42 pooka Exp $");
|
||||
__RCSID("$NetBSD: creds.c,v 1.8 2007/03/22 16:57:27 pooka Exp $");
|
||||
#endif /* !lint */
|
||||
|
||||
/*
|
||||
@ -201,8 +201,8 @@ puffs_access(enum vtype type, mode_t file_mode, uid_t uid, gid_t gid,
|
||||
}
|
||||
|
||||
int
|
||||
puffs_access_chown(const struct puffs_cred *pcr, uid_t owner, gid_t group,
|
||||
uid_t newowner, gid_t newgroup)
|
||||
puffs_access_chown(uid_t owner, gid_t group, uid_t newowner, gid_t newgroup,
|
||||
const struct puffs_cred *pcr)
|
||||
{
|
||||
|
||||
if (newowner == (uid_t)PUFFS_VNOVAL)
|
||||
@ -219,8 +219,8 @@ puffs_access_chown(const struct puffs_cred *pcr, uid_t owner, gid_t group,
|
||||
}
|
||||
|
||||
int
|
||||
puffs_access_chmod(const struct puffs_cred *pcr, uid_t owner, gid_t group,
|
||||
enum vtype type, mode_t mode)
|
||||
puffs_access_chmod(uid_t owner, gid_t group, enum vtype type, mode_t mode,
|
||||
const struct puffs_cred *pcr)
|
||||
{
|
||||
|
||||
if (!puffs_cred_isuid(pcr, owner) && !puffs_cred_isuid(pcr, 0))
|
||||
@ -237,8 +237,8 @@ puffs_access_chmod(const struct puffs_cred *pcr, uid_t owner, gid_t group,
|
||||
}
|
||||
|
||||
int
|
||||
puffs_access_times(const struct puffs_cred *pcr, uid_t uid, gid_t gid,
|
||||
mode_t mode, int va_utimes_null)
|
||||
puffs_access_times(uid_t uid, gid_t gid, mode_t mode, int va_utimes_null,
|
||||
const struct puffs_cred *pcr)
|
||||
{
|
||||
|
||||
if (!puffs_cred_isuid(pcr, uid) && !puffs_cred_isuid(pcr, 0)
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* $NetBSD: puffs.h,v 1.37 2007/03/22 15:32:22 pooka Exp $ */
|
||||
/* $NetBSD: puffs.h,v 1.38 2007/03/22 16:57:27 pooka Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2005, 2006 Antti Kantee. All Rights Reserved.
|
||||
@ -456,12 +456,12 @@ int puffs_cred_isjuggernaut(const struct puffs_cred *);
|
||||
/* misc */
|
||||
int puffs_access(enum vtype, mode_t, uid_t, gid_t, mode_t,
|
||||
const struct puffs_cred *);
|
||||
int puffs_access_chown(const struct puffs_cred *, uid_t, gid_t,
|
||||
uid_t, gid_t);
|
||||
int puffs_access_chmod(const struct puffs_cred *, uid_t, gid_t,
|
||||
enum vtype, mode_t);
|
||||
int puffs_access_times(const struct puffs_cred *, uid_t, gid_t,
|
||||
mode_t, int);
|
||||
int puffs_access_chown(uid_t, gid_t, uid_t, gid_t,
|
||||
const struct puffs_cred *);
|
||||
int puffs_access_chmod(uid_t, gid_t, enum vtype, mode_t,
|
||||
const struct puffs_cred *);
|
||||
int puffs_access_times(uid_t, gid_t, mode_t, int,
|
||||
const struct puffs_cred *);
|
||||
|
||||
|
||||
/*
|
||||
|
Loading…
Reference in New Issue
Block a user