PERFORCE change 22946 for review
Robert Watson
rwatson at freebsd.org
Mon Dec 30 21:37:18 GMT 2002
http://perforce.freebsd.org/chv.cgi?CH=22946
Change 22946 by rwatson at rwatson_paprika on 2002/12/30 13:37:00
Integ TrustedBSD base. Loop back a number of ACL changes,
including ACL link calls, changes to ACL tools and libraries
to support these calls. Also, Sam Leffler's revisions to my
m_tag patch, which gets m_tag sufficiently into shape that we
can experiment with storing MAC labels in m_tag's without
extensive local changes.
Affected files ...
.. //depot/projects/trustedbsd/base/Makefile#19 integrate
.. //depot/projects/trustedbsd/base/Makefile.inc1#31 integrate
.. //depot/projects/trustedbsd/base/bin/df/df.c#12 integrate
.. //depot/projects/trustedbsd/base/bin/getfacl/getfacl.1#4 integrate
.. //depot/projects/trustedbsd/base/bin/getfacl/getfacl.c#6 integrate
.. //depot/projects/trustedbsd/base/bin/setfacl/setfacl.1#3 integrate
.. //depot/projects/trustedbsd/base/bin/setfacl/setfacl.c#4 integrate
.. //depot/projects/trustedbsd/base/bin/setfacl/setfacl.h#3 integrate
.. //depot/projects/trustedbsd/base/etc/mtree/BSD.include.dist#14 integrate
.. //depot/projects/trustedbsd/base/etc/mtree/BSD.local.dist#12 integrate
.. //depot/projects/trustedbsd/base/etc/mtree/BSD.usr.dist#21 integrate
.. //depot/projects/trustedbsd/base/include/Makefile#24 integrate
.. //depot/projects/trustedbsd/base/include/stdlib.h#14 integrate
.. //depot/projects/trustedbsd/base/include/unistd.h#16 integrate
.. //depot/projects/trustedbsd/base/lib/libc/gen/basename.c#4 integrate
.. //depot/projects/trustedbsd/base/lib/libc/gen/dirname.c#4 integrate
.. //depot/projects/trustedbsd/base/lib/libc/gen/getbsize.3#3 integrate
.. //depot/projects/trustedbsd/base/lib/libc/gen/getbsize.c#4 integrate
.. //depot/projects/trustedbsd/base/lib/libc/gen/ualarm.3#3 integrate
.. //depot/projects/trustedbsd/base/lib/libc/gen/ualarm.c#3 integrate
.. //depot/projects/trustedbsd/base/lib/libc/gen/usleep.3#2 integrate
.. //depot/projects/trustedbsd/base/lib/libc/gen/usleep.c#3 integrate
.. //depot/projects/trustedbsd/base/lib/libc/posix1e/acl.3#4 integrate
.. //depot/projects/trustedbsd/base/lib/libc/posix1e/acl_delete.3#3 integrate
.. //depot/projects/trustedbsd/base/lib/libc/posix1e/acl_delete.c#3 integrate
.. //depot/projects/trustedbsd/base/lib/libc/posix1e/acl_dup.3#2 integrate
.. //depot/projects/trustedbsd/base/lib/libc/posix1e/acl_free.3#2 integrate
.. //depot/projects/trustedbsd/base/lib/libc/posix1e/acl_from_text.3#3 integrate
.. //depot/projects/trustedbsd/base/lib/libc/posix1e/acl_get.3#3 integrate
.. //depot/projects/trustedbsd/base/lib/libc/posix1e/acl_get.c#4 integrate
.. //depot/projects/trustedbsd/base/lib/libc/posix1e/acl_init.3#2 integrate
.. //depot/projects/trustedbsd/base/lib/libc/posix1e/acl_set.3#3 integrate
.. //depot/projects/trustedbsd/base/lib/libc/posix1e/acl_set.c#4 integrate
.. //depot/projects/trustedbsd/base/lib/libc/posix1e/acl_to_text.3#3 integrate
.. //depot/projects/trustedbsd/base/lib/libc/posix1e/acl_valid.3#2 integrate
.. //depot/projects/trustedbsd/base/lib/libc/posix1e/acl_valid.c#4 integrate
.. //depot/projects/trustedbsd/base/lib/libmp/Makefile#3 integrate
.. //depot/projects/trustedbsd/base/sbin/fdisk/fdisk.c#13 integrate
.. //depot/projects/trustedbsd/base/sbin/mount_smbfs/Makefile#2 integrate
.. //depot/projects/trustedbsd/base/sbin/swapon/Makefile#4 integrate
.. //depot/projects/trustedbsd/base/sbin/swapon/swapon.8#5 integrate
.. //depot/projects/trustedbsd/base/sbin/swapon/swapon.c#4 integrate
.. //depot/projects/trustedbsd/base/share/colldef/Makefile#10 integrate
.. //depot/projects/trustedbsd/base/share/colldef/ca_ES.ISO8859-1.src#1 branch
.. //depot/projects/trustedbsd/base/share/colldef/ca_ES.ISO8859-15.src#1 branch
.. //depot/projects/trustedbsd/base/share/man/man5/Makefile#5 integrate
.. //depot/projects/trustedbsd/base/share/man/man5/msdos.5#2 delete
.. //depot/projects/trustedbsd/base/share/man/man5/msdosfs.5#1 branch
.. //depot/projects/trustedbsd/base/share/mklocale/Makefile#9 integrate
.. //depot/projects/trustedbsd/base/share/monetdef/Makefile#10 integrate
.. //depot/projects/trustedbsd/base/share/monetdef/ca_ES.ISO8859-1.src#1 branch
.. //depot/projects/trustedbsd/base/share/msgdef/Makefile#10 integrate
.. //depot/projects/trustedbsd/base/share/msgdef/ca_ES.ISO8859-1.src#1 branch
.. //depot/projects/trustedbsd/base/share/numericdef/Makefile#10 integrate
.. //depot/projects/trustedbsd/base/share/numericdef/ca_ES.ISO8859-1.src#1 branch
.. //depot/projects/trustedbsd/base/share/timedef/Makefile#9 integrate
.. //depot/projects/trustedbsd/base/share/timedef/ca_ES.ISO8859-1.src#1 branch
.. //depot/projects/trustedbsd/base/sys/boot/ficl/words.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/cam/cam_queue.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/dev/amr/amr.c#8 integrate
.. //depot/projects/trustedbsd/base/sys/dev/an/if_aironet_ieee.h#4 integrate
.. //depot/projects/trustedbsd/base/sys/dev/an/if_an.c#14 integrate
.. //depot/projects/trustedbsd/base/sys/dev/an/if_an_pccard.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/dev/an/if_an_pci.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/dev/an/if_anreg.h#5 integrate
.. //depot/projects/trustedbsd/base/sys/dev/awi/awi.c#9 integrate
.. //depot/projects/trustedbsd/base/sys/dev/awi/awi_wep.c#6 integrate
.. //depot/projects/trustedbsd/base/sys/dev/ccd/ccd.c#10 integrate
.. //depot/projects/trustedbsd/base/sys/dev/cm/smc90cx6.c#5 integrate
.. //depot/projects/trustedbsd/base/sys/dev/en/midway.c#6 integrate
.. //depot/projects/trustedbsd/base/sys/dev/firewire/iec13213.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/dev/hifn/hifn7751.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/dev/isp/isp.c#17 integrate
.. //depot/projects/trustedbsd/base/sys/dev/isp/isp_target.c#6 integrate
.. //depot/projects/trustedbsd/base/sys/dev/isp/isp_tpublic.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/dev/nge/if_nge.c#14 integrate
.. //depot/projects/trustedbsd/base/sys/dev/ppbus/if_plip.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/dev/ppbus/ppi.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/dev/puc/puc.c#8 integrate
.. //depot/projects/trustedbsd/base/sys/dev/puc/pucdata.c#9 integrate
.. //depot/projects/trustedbsd/base/sys/dev/sab/sab.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/dev/sym/sym_fw1.h#3 integrate
.. //depot/projects/trustedbsd/base/sys/dev/sym/sym_fw2.h#3 integrate
.. //depot/projects/trustedbsd/base/sys/dev/sym/sym_hipd.c#8 integrate
.. //depot/projects/trustedbsd/base/sys/dev/ubsec/ubsec.c#5 integrate
.. //depot/projects/trustedbsd/base/sys/dev/wl/if_wl.c#6 integrate
.. //depot/projects/trustedbsd/base/sys/fs/fifofs/fifo_vnops.c#19 integrate
.. //depot/projects/trustedbsd/base/sys/fs/hpfs/hpfs_vnops.c#13 integrate
.. //depot/projects/trustedbsd/base/sys/fs/nullfs/null_vnops.c#8 integrate
.. //depot/projects/trustedbsd/base/sys/fs/smbfs/smbfs_smb.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/geom/geom_mbr.c#13 integrate
.. //depot/projects/trustedbsd/base/sys/gnu/ext2fs/ext2_linux_balloc.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/i386/conf/OLDCARD#8 integrate
.. //depot/projects/trustedbsd/base/sys/i386/conf/SMP#1 branch
.. //depot/projects/trustedbsd/base/sys/i386/isa/istallion.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/ia64/ia32/syscalls.master#10 integrate
.. //depot/projects/trustedbsd/base/sys/kern/init_sysent.c#27 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_acl.c#12 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_proc.c#27 integrate
.. //depot/projects/trustedbsd/base/sys/kern/kern_subr.c#12 integrate
.. //depot/projects/trustedbsd/base/sys/kern/syscalls.c#28 integrate
.. //depot/projects/trustedbsd/base/sys/kern/syscalls.master#27 integrate
.. //depot/projects/trustedbsd/base/sys/kern/uipc_mbuf.c#12 integrate
.. //depot/projects/trustedbsd/base/sys/kern/uipc_mbuf2.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/kern/vfs_subr.c#34 integrate
.. //depot/projects/trustedbsd/base/sys/net/if_loop.c#11 integrate
.. //depot/projects/trustedbsd/base/sys/net/if_var.h#13 integrate
.. //depot/projects/trustedbsd/base/sys/netatm/port.h#6 integrate
.. //depot/projects/trustedbsd/base/sys/netatm/spans/spans_msg.c#6 integrate
.. //depot/projects/trustedbsd/base/sys/netatm/spans/spans_util.c#3 integrate
.. //depot/projects/trustedbsd/base/sys/netatm/uni/sscop_lower.c#5 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/ip_icmp.c#12 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/ip_input.c#20 integrate
.. //depot/projects/trustedbsd/base/sys/netinet/tcp_input.c#30 integrate
.. //depot/projects/trustedbsd/base/sys/netinet6/esp_input.c#7 integrate
.. //depot/projects/trustedbsd/base/sys/netinet6/icmp6.c#8 integrate
.. //depot/projects/trustedbsd/base/sys/netinet6/ip6_input.c#9 integrate
.. //depot/projects/trustedbsd/base/sys/netinet6/ip6_output.c#10 integrate
.. //depot/projects/trustedbsd/base/sys/netinet6/ip6_var.h#4 integrate
.. //depot/projects/trustedbsd/base/sys/netinet6/ipsec.c#5 integrate
.. //depot/projects/trustedbsd/base/sys/netinet6/nd6_nbr.c#5 integrate
.. //depot/projects/trustedbsd/base/sys/netipsec/ipsec_mbuf.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/netipsec/ipsec_output.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/netsmb/smb.h#7 integrate
.. //depot/projects/trustedbsd/base/sys/nfsclient/bootp_subr.c#9 integrate
.. //depot/projects/trustedbsd/base/sys/pc98/pc98/olpt.c#2 integrate
.. //depot/projects/trustedbsd/base/sys/pci/if_xl.c#14 integrate
.. //depot/projects/trustedbsd/base/sys/pci/ncr.c#4 integrate
.. //depot/projects/trustedbsd/base/sys/sparc64/include/tte.h#9 integrate
.. //depot/projects/trustedbsd/base/sys/sparc64/pci/psycho.c#15 integrate
.. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/cache.c#10 integrate
.. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/exception.S#13 integrate
.. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/genassym.c#20 integrate
.. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/interrupt.S#2 integrate
.. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/mp_exception.S#2 integrate
.. //depot/projects/trustedbsd/base/sys/sys/_mutex.h#6 integrate
.. //depot/projects/trustedbsd/base/sys/sys/acl.h#5 integrate
.. //depot/projects/trustedbsd/base/sys/sys/diskmbr.h#2 integrate
.. //depot/projects/trustedbsd/base/sys/sys/mbuf.h#16 integrate
.. //depot/projects/trustedbsd/base/sys/sys/msg.h#5 integrate
.. //depot/projects/trustedbsd/base/sys/sys/namei.h#6 integrate
.. //depot/projects/trustedbsd/base/sys/sys/signal.h#10 integrate
.. //depot/projects/trustedbsd/base/sys/sys/syscall.h#28 integrate
.. //depot/projects/trustedbsd/base/sys/sys/syscall.mk#28 integrate
.. //depot/projects/trustedbsd/base/sys/sys/sysproto.h#29 integrate
.. //depot/projects/trustedbsd/base/sys/sys/unpcb.h#3 integrate
.. //depot/projects/trustedbsd/base/sys/sys/vnode.h#32 integrate
.. //depot/projects/trustedbsd/base/sys/vm/vm_fault.c#19 integrate
.. //depot/projects/trustedbsd/base/sys/vm/vm_kern.c#13 integrate
.. //depot/projects/trustedbsd/base/sys/vm/vm_map.c#20 integrate
.. //depot/projects/trustedbsd/base/sys/vm/vm_object.c#24 integrate
.. //depot/projects/trustedbsd/base/sys/vm/vm_object.h#10 integrate
.. //depot/projects/trustedbsd/base/sys/vm/vm_page.c#28 integrate
.. //depot/projects/trustedbsd/base/usr.bin/Makefile#20 integrate
.. //depot/projects/trustedbsd/base/usr.bin/calendar/Makefile#8 integrate
.. //depot/projects/trustedbsd/base/usr.bin/chpass/Makefile#4 integrate
.. //depot/projects/trustedbsd/base/usr.bin/chpass/chpass.c#6 integrate
.. //depot/projects/trustedbsd/base/usr.bin/du/du.c#8 integrate
.. //depot/projects/trustedbsd/base/usr.bin/elf2aout/Makefile#4 integrate
.. //depot/projects/trustedbsd/base/usr.bin/elf2aout/elf2aout.c#5 integrate
.. //depot/projects/trustedbsd/base/usr.bin/systat/swap.c#5 integrate
.. //depot/projects/trustedbsd/base/usr.bin/telnet/telnet.c#5 integrate
.. //depot/projects/trustedbsd/base/usr.bin/whereis/Makefile#3 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/Makefile#17 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/ancontrol/ancontrol.8#9 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/ancontrol/ancontrol.c#7 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/boot0cfg/boot0cfg.c#4 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/burncd/Makefile#3 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/burncd/burncd.c#13 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/chown/chown.c#6 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/crunch/crunchide/endian.h#2 delete
.. //depot/projects/trustedbsd/base/usr.sbin/crunch/crunchide/exec_elf32.c#5 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/elf2aout/Makefile#3 delete
.. //depot/projects/trustedbsd/base/usr.sbin/elf2aout/elf2aout.c#2 delete
.. //depot/projects/trustedbsd/base/usr.sbin/fwcontrol/Makefile#1 branch
.. //depot/projects/trustedbsd/base/usr.sbin/fwcontrol/fwcontrol.8#1 branch
.. //depot/projects/trustedbsd/base/usr.sbin/fwcontrol/fwcontrol.c#1 branch
.. //depot/projects/trustedbsd/base/usr.sbin/fwcontrol/fwcrom.c#1 branch
.. //depot/projects/trustedbsd/base/usr.sbin/mixer/mixer.c#2 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/pkg_install/info/show.c#6 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/pstat/pstat.c#6 integrate
.. //depot/projects/trustedbsd/base/usr.sbin/quot/quot.c#6 integrate
Differences ...
==== //depot/projects/trustedbsd/base/Makefile#19 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/Makefile,v 1.272 2002/12/14 22:36:56 imp Exp $
+# $FreeBSD: src/Makefile,v 1.273 2002/12/30 16:48:35 schweikh Exp $
#
# The user-driven targets are:
#
@@ -17,7 +17,7 @@
# upgrade - Upgrade a.out (2.2.x/3.0) system to the new ELF way
# most - Build user commands, no libraries or include files.
# installmost - Install user commands, no libraries or include files.
-# aout-to-elf - Upgrade an system from a.out to elf format (see below).
+# aout-to-elf - Upgrade a system from a.out to elf format (see below).
# aout-to-elf-build - Build everything required to upgrade a system from
# a.out to elf format (see below).
# aout-to-elf-install - Install everything built by aout-to-elf-build (see
@@ -26,7 +26,7 @@
# of each elf library sub-directory.
#
# This makefile is simple by design. The FreeBSD make automatically reads
-# the /usr/share/mk/sys.mk unless the -m argument is specified on the
+# the /usr/share/mk/sys.mk unless the -m argument is specified on the
# command line. By keeping this makefile simple, it doesn't matter too
# much how different the installed mk files are from those in the source
# tree. This makefile executes a child make process, forcing it to use
@@ -71,7 +71,7 @@
# The aout->elf transition build is performed by doing a `make upgrade' (or
# `make aout-to-elf') or in two steps by a `make aout-to-elf-build' followed
# by a `make aout-to-elf-install', depending on user preference.
-# You need to have at least 320 Mb of free space for the object tree.
+# You need to have at least 320 MB of free space for the object tree.
#
# The upgrade process checks the installed release. If this is 3.0-CURRENT,
# it is assumed that your kernel contains all the syscalls required by the
@@ -251,4 +251,3 @@
> _.${TARGET_ARCH}.${kernel} 2>&1
.endif
.endfor
-
==== //depot/projects/trustedbsd/base/Makefile.inc1#31 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/Makefile.inc1,v 1.313 2002/12/02 14:03:40 ru Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.314 2002/12/30 10:01:25 obrien Exp $
#
# Make command line options:
# -DMAKE_KERBEROS4 to build KerberosIV
@@ -663,7 +663,7 @@
.endif
.if ${TARGET_ARCH} == "sparc64"
-_elf2aout= usr.sbin/elf2aout
+_elf2aout= usr.bin/elf2aout
.endif
_xlint= usr.bin/xlint/lint1 usr.bin/xlint/lint2 usr.bin/xlint/xlint
==== //depot/projects/trustedbsd/base/bin/df/df.c#12 (text+ko) ====
@@ -48,7 +48,7 @@
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.44 2002/10/23 22:09:05 markm Exp $");
+__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.45 2002/12/30 18:10:37 mike Exp $");
#include <sys/param.h>
#include <sys/stat.h>
@@ -381,8 +381,7 @@
prtstat(struct statfs *sfsp, struct maxwidths *mwp)
{
static long blocksize;
- static int timesthrough;
- static size_t headerlen;
+ static int headerlen, timesthrough;
static const char *header;
long used, availblks, inodes;
@@ -393,7 +392,7 @@
mwp->total = mwp->used = mwp->avail = strlen(header);
} else {
header = getbsize(&headerlen, &blocksize);
- mwp->total = imax(mwp->total, (int)headerlen);
+ mwp->total = imax(mwp->total, headerlen);
}
mwp->used = imax(mwp->used, strlen("Used"));
mwp->avail = imax(mwp->avail, strlen("Avail"));
@@ -442,7 +441,7 @@
update_maxwidths(struct maxwidths *mwp, struct statfs *sfsp)
{
static long blocksize;
- size_t dummy;
+ int dummy;
if (blocksize == 0)
getbsize(&dummy, &blocksize);
==== //depot/projects/trustedbsd/base/bin/getfacl/getfacl.1#4 (text+ko) ====
@@ -1,5 +1,5 @@
.\"-
-.\" Copyright (c) 2000-2001 Robert N. M. Watson
+.\" Copyright (c) 2000, 2001, 2002 Robert N. M. Watson
.\" All rights reserved.
.\"
.\" This software was developed by Robert Watson for the TrustedBSD Project.
@@ -25,12 +25,12 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/bin/getfacl/getfacl.1,v 1.5 2002/11/03 23:22:34 tjr Exp $
+.\" $FreeBSD: src/bin/getfacl/getfacl.1,v 1.6 2002/12/30 15:36:29 rwatson Exp $
.\"
.\" Developed by the TrustedBSD Project.
.\" Support for POSIX.1e access control lists.
.\"
-.Dd March 30, 2000
+.Dd Decemer 30, 2002
.Dt GETFACL 1
.Os
.Sh NAME
@@ -38,7 +38,7 @@
.Nd get ACL information
.Sh SYNOPSIS
.Nm
-.Op Fl d
+.Op Fl dh
.Op Ar
.Sh DESCRIPTION
The
@@ -61,6 +61,9 @@
access ACL.
An error is generated if a default ACL cannot be associated with
.Ar file .
+.It Fl h
+If the target of the operation is a symbolic link, return the ACL from
+the symbol link itself rather than following the link.
.El
.Pp
The following operand is available:
==== //depot/projects/trustedbsd/base/bin/getfacl/getfacl.c#6 (text+ko) ====
@@ -1,5 +1,5 @@
/*-
- * Copyright (c) 1999-2001 Robert N M Watson
+ * Copyright (c) 1999, 2001, 2002 Robert N M Watson
* All rights reserved.
*
* This software was developed by Robert Watson for the TrustedBSD Project.
@@ -32,7 +32,7 @@
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/getfacl/getfacl.c,v 1.8 2002/11/03 23:22:34 tjr Exp $");
+__FBSDID("$FreeBSD: src/bin/getfacl/getfacl.c,v 1.9 2002/12/30 15:36:29 rwatson Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -52,7 +52,7 @@
usage(void)
{
- fprintf(stderr, "getfacl [-d] [files ...]\n");
+ fprintf(stderr, "getfacl [-dh] [files ...]\n");
}
/*
@@ -147,14 +147,17 @@
}
static int
-print_acl(char *path, acl_type_t type)
+print_acl(char *path, acl_type_t type, int hflag)
{
struct stat sb;
acl_t acl;
char *acl_text;
int error;
- error = stat(path, &sb);
+ if (hflag)
+ error = lstat(path, &sb);
+ else
+ error = stat(path, &sb);
if (error == -1) {
warn("%s", path);
return(-1);
@@ -167,7 +170,10 @@
printf("#file:%s\n#owner:%d\n#group:%d\n", path, sb.st_uid, sb.st_gid);
- acl = acl_get_file(path, type);
+ if (hflag)
+ acl = acl_get_link_np(path, type);
+ else
+ acl = acl_get_file(path, type);
if (!acl) {
if (errno != EOPNOTSUPP) {
warn("%s", path);
@@ -198,7 +204,7 @@
}
static int
-print_acl_from_stdin(acl_type_t type)
+print_acl_from_stdin(acl_type_t type, int hflag)
{
char *p, pathname[PATH_MAX];
int carried_error = 0;
@@ -206,7 +212,7 @@
while (fgets(pathname, (int)sizeof(pathname), stdin)) {
if ((p = strchr(pathname, '\n')) != NULL)
*p = '\0';
- if (print_acl(pathname, type) == -1) {
+ if (print_acl(pathname, type, hflag) == -1) {
carried_error = -1;
}
}
@@ -220,12 +226,17 @@
acl_type_t type = ACL_TYPE_ACCESS;
int carried_error = 0;
int ch, error, i;
+ int hflag;
- while ((ch = getopt(argc, argv, "d")) != -1)
+ hflag = 0;
+ while ((ch = getopt(argc, argv, "dh")) != -1)
switch(ch) {
case 'd':
type = ACL_TYPE_DEFAULT;
break;
+ case 'h':
+ hflag = 1;
+ break;
default:
usage();
return(-1);
@@ -234,17 +245,17 @@
argv += optind;
if (argc == 0) {
- error = print_acl_from_stdin(type);
+ error = print_acl_from_stdin(type, hflag);
return(error ? 1 : 0);
}
for (i = 0; i < argc; i++) {
if (!strcmp(argv[i], "-")) {
- error = print_acl_from_stdin(type);
+ error = print_acl_from_stdin(type, hflag);
if (error == -1)
carried_error = -1;
} else {
- error = print_acl(argv[i], type);
+ error = print_acl(argv[i], type, hflag);
if (error == -1)
carried_error = -1;
}
==== //depot/projects/trustedbsd/base/bin/setfacl/setfacl.1#3 (text+ko) ====
@@ -23,7 +23,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/bin/setfacl/setfacl.1,v 1.7 2001/12/04 14:20:46 ru Exp $
+.\" $FreeBSD: src/bin/setfacl/setfacl.1,v 1.8 2002/12/30 15:36:29 rwatson Exp $
.\"
.Dd January 7, 2001
.Dt SETFACL 1
@@ -33,7 +33,7 @@
.Nd set ACL information
.Sh SYNOPSIS
.Nm
-.Op Fl bdkn
+.Op Fl bdhkn
.Op Fl m Ar entries
.Op Fl M Ar file1
.Op Fl x Ar entries
@@ -63,6 +63,9 @@
The operations apply to the default ACL entries instead of
access ACL entries. Currently only directories may have
default ACL's.
+.It Fl h
+If the target of the operation is a symbolic link, perform the operation
+on the symbolic link itself, rather than following the link.
.It Fl k
Delete any default ACL entries on the specified files. It
is not considered an error if the specified files do not have
==== //depot/projects/trustedbsd/base/bin/setfacl/setfacl.c#4 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/setfacl/setfacl.c,v 1.6 2002/06/30 05:15:03 obrien Exp $");
+__FBSDID("$FreeBSD: src/bin/setfacl/setfacl.c,v 1.7 2002/12/30 15:36:29 rwatson Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -71,11 +71,19 @@
}
acl = zmalloc(sizeof(acl_t) * 2);
- acl[ACCESS_ACL] = acl_get_file(filename, ACL_TYPE_ACCESS);
+ if (h_flag)
+ acl[ACCESS_ACL] = acl_get_link_np(filename, ACL_TYPE_ACCESS);
+ else
+ acl[ACCESS_ACL] = acl_get_file(filename, ACL_TYPE_ACCESS);
if (acl[ACCESS_ACL] == NULL)
err(1, "acl_get_file() failed");
if (S_ISDIR(sb.st_mode)) {
- acl[DEFAULT_ACL] = acl_get_file(filename, ACL_TYPE_DEFAULT);
+ if (h_flag)
+ acl[DEFAULT_ACL] = acl_get_link_np(filename,
+ ACL_TYPE_DEFAULT);
+ else
+ acl[DEFAULT_ACL] = acl_get_file(filename,
+ ACL_TYPE_DEFAULT);
if (acl[DEFAULT_ACL] == NULL)
err(1, "acl_get_file() failed");
} else
@@ -88,7 +96,7 @@
usage(void)
{
- fprintf(stderr, "usage: setfacl [-bdknv] [-m entries] [-M file1] "
+ fprintf(stderr, "usage: setfacl [-bdhknv] [-m entries] [-M file1] "
"[-x entries] [-X file2] [file ...]\n");
exit(1);
}
@@ -104,12 +112,12 @@
acl_type = ACL_TYPE_ACCESS;
carried_error = local_error = 0;
- have_mask = have_stdin = n_flag = need_mask = 0;
+ h_flag = have_mask = have_stdin = n_flag = need_mask = 0;
TAILQ_INIT(&entrylist);
TAILQ_INIT(&filelist);
- while ((ch = getopt(argc, argv, "M:X:bdkm:nx:")) != -1)
+ while ((ch = getopt(argc, argv, "M:X:bdhkm:nx:")) != -1)
switch(ch) {
case 'M':
entry = zmalloc(sizeof(struct sf_entry));
@@ -133,6 +141,9 @@
case 'd':
acl_type = ACL_TYPE_DEFAULT;
break;
+ case 'h':
+ h_flag = 1;
+ break;
case 'k':
entry = zmalloc(sizeof(struct sf_entry));
entry->op = OP_REMOVE_DEF;
==== //depot/projects/trustedbsd/base/bin/setfacl/setfacl.h#3 (text+ko) ====
@@ -23,7 +23,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/bin/setfacl/setfacl.h,v 1.3 2001/12/03 01:20:52 jedgar Exp $
+ * $FreeBSD: src/bin/setfacl/setfacl.h,v 1.4 2002/12/30 15:36:29 rwatson Exp $
*/
#ifndef _SETFACL_H
@@ -75,6 +75,7 @@
uint have_mask;
uint need_mask;
uint have_stdin;
+uint h_flag;
uint n_flag;
#endif /* _SETFACL_H */
==== //depot/projects/trustedbsd/base/etc/mtree/BSD.include.dist#14 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.63 2002/12/03 15:05:32 rwatson Exp $
+# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.64 2002/12/30 09:45:03 simokawa Exp $
#
# Please see the file src/etc/mtree/README before making changes to this file.
#
@@ -20,6 +20,8 @@
..
iicbus
..
+ firewire
+ ..
ofw
..
ppbus
==== //depot/projects/trustedbsd/base/etc/mtree/BSD.local.dist#12 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/mtree/BSD.local.dist,v 1.93 2002/10/29 16:48:03 tobez Exp $
+# $FreeBSD: src/etc/mtree/BSD.local.dist,v 1.94 2002/12/30 08:52:05 ache Exp $
#
# Please see the file src/etc/mtree/README before making changes to this file.
#
@@ -231,6 +231,10 @@
..
bg_BG.CP1251
..
+ ca_ES.ISO8859-1
+ ..
+ ca_ES.ISO8859-15
+ ..
cs_CZ.ISO8859-2
..
da_DK.ISO8859-1
==== //depot/projects/trustedbsd/base/etc/mtree/BSD.usr.dist#21 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.269 2002/11/15 18:44:09 ru Exp $
+# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.270 2002/12/30 08:52:05 ache Exp $
#
# Please see the file src/etc/mtree/README before making changes to this file.
#
@@ -341,6 +341,10 @@
..
bg_BG.CP1251
..
+ ca_ES.ISO8859-1
+ ..
+ ca_ES.ISO8859-15
+ ..
cs_CZ.ISO8859-2
..
da_DK.ISO8859-1
@@ -669,6 +673,10 @@
..
bg_BG.CP1251
..
+ ca_ES.ISO8859-1
+ ..
+ ca_ES.ISO8859-15
+ ..
cs_CZ.ISO8859-2
..
da_DK.ISO8859-1
==== //depot/projects/trustedbsd/base/include/Makefile#24 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 8.2 (Berkeley) 1/4/94
-# $FreeBSD: src/include/Makefile,v 1.192 2002/12/26 14:30:55 tjr Exp $
+# $FreeBSD: src/include/Makefile,v 1.193 2002/12/30 09:45:03 simokawa Exp $
#
# Doing a make install builds /usr/include
#
@@ -33,8 +33,8 @@
netipx netkey netnatm netncp netns netsmb nfs nfsclient nfsserver \
pccard posix4 sys vm
-LSUBDIRS= cam/scsi dev/an dev/ic dev/iicbus dev/ofw dev/ppbus dev/smbus \
- dev/usb dev/wi fs/devfs \
+LSUBDIRS= cam/scsi dev/an dev/ic dev/iicbus dev/firewire dev/ofw \
+ dev/ppbus dev/smbus dev/usb dev/wi fs/devfs \
fs/fdescfs fs/fifofs fs/msdosfs fs/ntfs fs/nullfs fs/nwfs fs/portalfs \
fs/procfs fs/smbfs fs/umapfs fs/unionfs isofs/cd9660 \
netatm/ipatm netatm/sigpvc netatm/spans netatm/uni \
==== //depot/projects/trustedbsd/base/include/stdlib.h#14 (text+ko) ====
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)stdlib.h 8.5 (Berkeley) 5/19/95
- * $FreeBSD: src/include/stdlib.h,v 1.45 2002/10/23 14:18:07 markm Exp $
+ * $FreeBSD: src/include/stdlib.h,v 1.46 2002/12/30 11:12:16 obrien Exp $
*/
#ifndef _STDLIB_H_
@@ -227,7 +227,7 @@
arc4random(void);
void arc4random_addrandom(unsigned char *dat, int datlen);
void arc4random_stir(void);
-char *getbsize(size_t *, long *);
+char *getbsize(int *, long *);
/* getcap(3) functions */
char *cgetcap(char *, const char *, int);
int cgetclose(void);
==== //depot/projects/trustedbsd/base/include/unistd.h#16 (text+ko) ====
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)unistd.h 8.12 (Berkeley) 4/27/95
- * $FreeBSD: src/include/unistd.h,v 1.65 2002/12/15 19:17:56 dillon Exp $
+ * $FreeBSD: src/include/unistd.h,v 1.66 2002/12/29 01:07:55 mike Exp $
*/
#ifndef _UNISTD_H_
@@ -47,6 +47,16 @@
#define _GID_T_DECLARED
#endif
+#ifndef _OFF_T_DECLARED
+typedef __off_t off_t;
+#define _OFF_T_DECLARED
+#endif
+
+#ifndef _PID_T_DECLARED
+typedef __pid_t pid_t;
+#define _PID_T_DECLARED
+#endif
+
#ifndef _SIZE_T_DECLARED
typedef __size_t size_t;
#define _SIZE_T_DECLARED
@@ -58,13 +68,14 @@
#endif
#ifndef _UID_T_DECLARED
-typedef __uid_t_ uid_t;
+typedef __uid_t uid_t;
#define _UID_T_DECLARED
#endif
-/*
- * XXX missing type definitions for off_t, pid_t and useconds_t.
- */
+#ifndef _USECONDS_T_DECLARED
+typedef __useconds_t useconds_t;
+#define _USECONDS_T_DECLARED
+#endif
#define STDIN_FILENO 0 /* standard input file descriptor */
#define STDOUT_FILENO 1 /* standard output file descriptor */
@@ -427,8 +438,8 @@
int setreuid(uid_t, uid_t);
/* void swab(const void * __restrict, void * __restrict, ssize_t); */
void sync(void);
-unsigned int ualarm(unsigned int, unsigned int);
-int usleep(unsigned int);
+useconds_t ualarm(useconds_t, useconds_t);
+int usleep(useconds_t);
pid_t vfork(void);
/* See comment at ftruncate() above. */
==== //depot/projects/trustedbsd/base/lib/libc/gen/basename.c#4 (text+ko) ====
@@ -31,10 +31,11 @@
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/basename.c,v 1.6 2002/12/21 07:12:35 bbraun Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/gen/basename.c,v 1.7 2002/12/30 01:41:14 marcel Exp $");
#include <errno.h>
#include <libgen.h>
+#include <stdlib.h>
#include <string.h>
#include <sys/param.h>
==== //depot/projects/trustedbsd/base/lib/libc/gen/dirname.c#4 (text+ko) ====
@@ -31,10 +31,11 @@
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/dirname.c,v 1.6 2002/12/21 07:12:35 bbraun Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/gen/dirname.c,v 1.7 2002/12/30 01:41:14 marcel Exp $");
#include <errno.h>
#include <libgen.h>
+#include <stdlib.h>
#include <string.h>
#include <sys/param.h>
==== //depot/projects/trustedbsd/base/lib/libc/gen/getbsize.3#3 (text+ko) ====
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)getbsize.3 8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: src/lib/libc/gen/getbsize.3,v 1.9 2002/10/23 14:18:07 markm Exp $
+.\" $FreeBSD: src/lib/libc/gen/getbsize.3,v 1.10 2002/12/30 11:12:16 obrien Exp $
.\"
.Dd June 4, 1993
.Dt GETBSIZE 3
@@ -43,7 +43,7 @@
.Sh SYNOPSIS
.In stdlib.h
.Ft char *
-.Fn getbsize "size_t *headerlenp" "long *blocksizep"
+.Fn getbsize "int *headerlenp" "long *blocksizep"
.Sh DESCRIPTION
The
.Fn getbsize
==== //depot/projects/trustedbsd/base/lib/libc/gen/getbsize.c#4 (text+ko) ====
@@ -35,7 +35,7 @@
static char sccsid[] = "@(#)getbsize.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/getbsize.c,v 1.5 2002/10/23 14:18:07 markm Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/gen/getbsize.c,v 1.7 2002/12/30 19:04:06 obrien Exp $");
#include <err.h>
#include <stdio.h>
@@ -44,7 +44,7 @@
char *
getbsize(headerlenp, blocksizep)
- size_t *headerlenp;
+ int *headerlenp;
long *blocksizep;
{
static char header[20];
==== //depot/projects/trustedbsd/base/lib/libc/gen/ualarm.3#3 (text+ko) ====
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" From: @(#)ualarm.3 8.2 (Berkeley) 4/19/94
-.\" $FreeBSD: src/lib/libc/gen/ualarm.3,v 1.16 2002/12/18 13:33:02 ru Exp $
+.\" $FreeBSD: src/lib/libc/gen/ualarm.3,v 1.17 2002/12/29 00:59:09 mike Exp $
.\"
.Dd April 19, 1994
.Dt UALARM 3
@@ -42,8 +42,8 @@
.Lb libc
.Sh SYNOPSIS
.In unistd.h
-.Ft u_int
-.Fn ualarm "u_int microseconds" "u_int interval"
+.Ft useconds_t
+.Fn ualarm "useconds_t microseconds" "useconds_t interval"
.Sh DESCRIPTION
.Bf -symbolic
This is a simplified interface to
==== //depot/projects/trustedbsd/base/lib/libc/gen/ualarm.c#3 (text+ko) ====
@@ -35,7 +35,7 @@
static char sccsid[] = "@(#)ualarm.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/ualarm.c,v 1.3 2002/02/01 01:08:48 obrien Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/gen/ualarm.c,v 1.4 2002/12/29 00:59:09 mike Exp $");
#include <sys/time.h>
#include <unistd.h>
@@ -47,10 +47,10 @@
* If ``reload'' is non-zero, keep generating SIGALRM
* every ``reload'' microseconds after the first signal.
*/
-unsigned
+useconds_t
ualarm(usecs, reload)
- unsigned usecs;
- unsigned reload;
+ useconds_t usecs;
+ useconds_t reload;
{
struct itimerval new, old;
==== //depot/projects/trustedbsd/base/lib/libc/gen/usleep.3#2 (text+ko) ====
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)usleep.3 8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: src/lib/libc/gen/usleep.3,v 1.17 2001/10/01 16:08:51 ru Exp $
+.\" $FreeBSD: src/lib/libc/gen/usleep.3,v 1.18 2002/12/29 00:59:09 mike Exp $
.\"
.Dd February 13, 1998
.Dt USLEEP 3
@@ -43,7 +43,7 @@
.Sh SYNOPSIS
.In unistd.h
.Ft int
-.Fn usleep "unsigned int microseconds"
+.Fn usleep "useconds_t microseconds"
.Sh DESCRIPTION
The
.Fn usleep
==== //depot/projects/trustedbsd/base/lib/libc/gen/usleep.c#3 (text+ko) ====
@@ -35,7 +35,7 @@
static char sccsid[] = "@(#)usleep.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/usleep.c,v 1.27 2002/02/01 00:57:29 obrien Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/gen/usleep.c,v 1.28 2002/12/29 00:59:09 mike Exp $");
#include "namespace.h"
#include <time.h>
@@ -44,7 +44,7 @@
int
usleep(useconds)
- unsigned int useconds;
+ useconds_t useconds;
{
struct timespec time_to_sleep;
==== //depot/projects/trustedbsd/base/lib/libc/posix1e/acl.3#4 (text+ko) ====
@@ -2,6 +2,8 @@
.\" Copyright (c) 2000, 2001, 2002 Robert N. M. Watson
.\" All rights reserved.
.\"
+.\" This software was developed by Robert Watson for the TrustedBSD Project.
+.\"
.\" Redistribution and use in source and binary forms, with or without
.\" modification, are permitted provided that the following conditions
.\" are met:
@@ -23,9 +25,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/lib/libc/posix1e/acl.3,v 1.20 2002/12/27 12:15:28 schweikh Exp $
+.\" $FreeBSD: src/lib/libc/posix1e/acl.3,v 1.21 2002/12/29 20:47:05 rwatson Exp $
.\"
-.Dd January 28, 2000
+.Dd December 18, 2002
.Dt ACL 3
.Os
.Sh NAME
@@ -82,8 +84,10 @@
and may be used to create an empty entry in an ACL.
.It Xo
.Fn acl_delete_def_file ,
+.Fn acl_delete_def_link_np ,
+.Fn acl_delete_fd_np ,
.Fn acl_delete_file_np ,
-.Fn acl_delete_fd_np
+.Fn acl_delete_link_np
.Xc
These functions are described in
.Xr acl_delete 3 ,
@@ -114,9 +118,10 @@
.Xr acl_get_entry 3 ,
and may be used to retrieve a designated ACL entry from an ACL.
.It Xo
+.Fn acl_get_fd ,
+.Fn acl_get_fd_np ,
.Fn acl_get_file ,
-.Fn acl_get_fd ,
-.Fn acl_get_fd_np
+.Fn acl_get_link_np
.Xc
These functions are described in
.Xr acl_get 3 ,
@@ -138,9 +143,10 @@
.Xr acl_init 3 ,
and may be used to allocate a fresh (empty) ACL structure.
.It Xo
+.Fn acl_set_fd ,
+.Fn acl_set_fd_np ,
.Fn acl_set_file ,
-.Fn acl_set_fd ,
-.Fn acl_set_fd_np
+.Fn acl_set_link_np
.Xc
These functions are described in
.Xr acl_set 3 ,
@@ -163,8 +169,9 @@
and may be used to generate a text-form of a POSIX.1e semantics ACL.
.It Xo
.Fn acl_valid ,
+.Fn acl_valid_fd_np ,
.Fn acl_valid_file_np ,
-.Fn acl_valid_fd_np
+.Fn acl_valid_link_np
.Xc
These functions are described in
.Xr acl_valid 3 ,
==== //depot/projects/trustedbsd/base/lib/libc/posix1e/acl_delete.3#3 (text+ko) ====
@@ -1,7 +1,9 @@
.\"-
-.\" Copyright (c) 2000 Robert N. M. Watson
+.\" Copyright (c) 2000, 2002 Robert N. M. Watson
.\" All rights reserved.
.\"
+.\" This software was developed by Robert Watson for the TrustedBSD Project.
+.\"
.\" Redistribution and use in source and binary forms, with or without
.\" modification, are permitted provided that the following conditions
.\" are met:
@@ -23,15 +25,17 @@
>>> TRUNCATED FOR MAIL (1000 lines) <<<
To Unsubscribe: send mail to majordomo at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message
More information about the trustedbsd-cvs
mailing list