Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/src/sys/kern/vfs_syscalls.c,v rcsdiff: /ftp/cvs/cvsroot/src/sys/kern/vfs_syscalls.c,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.174 retrieving revision 1.174.2.1 diff -u -p -r1.174 -r1.174.2.1 --- src/sys/kern/vfs_syscalls.c 2002/05/11 00:45:06 1.174 +++ src/sys/kern/vfs_syscalls.c 2002/08/29 05:23:17 1.174.2.1 @@ -1,4 +1,4 @@ -/* $NetBSD: vfs_syscalls.c,v 1.174 2002/05/11 00:45:06 enami Exp $ */ +/* $NetBSD: vfs_syscalls.c,v 1.174.2.1 2002/08/29 05:23:17 gehenna Exp $ */ /* * Copyright (c) 1989, 1993 @@ -41,7 +41,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls.c,v 1.174 2002/05/11 00:45:06 enami Exp $"); +__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls.c,v 1.174.2.1 2002/08/29 05:23:17 gehenna Exp $"); #include "opt_compat_netbsd.h" #include "opt_compat_43.h" @@ -2470,7 +2470,7 @@ change_owner(vp, uid, gid, p, posix_sema if ((error = VOP_GETATTR(vp, &vattr, p->p_ucred, p)) != 0) goto out; -#define CHANGED(x) ((x) != -1) +#define CHANGED(x) ((int)(x) != -1) newmode = vattr.va_mode; if (posix_semantics) { /* @@ -2497,8 +2497,8 @@ change_owner(vp, uid, gid, p, posix_sema newmode = VNOVAL; VATTR_NULL(&vattr); - vattr.va_uid = CHANGED(uid) ? uid : VNOVAL; - vattr.va_gid = CHANGED(gid) ? gid : VNOVAL; + vattr.va_uid = CHANGED(uid) ? uid : (uid_t)VNOVAL; + vattr.va_gid = CHANGED(gid) ? gid : (gid_t)VNOVAL; vattr.va_mode = newmode; error = VOP_SETATTR(vp, &vattr, p->p_ucred, p); #undef CHANGED