diff options
| -rw-r--r-- | exception_lists/pmodes | 29 | ||||
| -rw-r--r-- | usr/src/tools/pmodes/README.pmodes | 37 | ||||
| -rw-r--r-- | usr/src/tools/pmodes/exceptions.h | 126 | ||||
| -rw-r--r-- | usr/src/tools/pmodes/pmodes.c | 8 |
4 files changed, 55 insertions, 145 deletions
diff --git a/exception_lists/pmodes b/exception_lists/pmodes index 027f48f48f..2ad8e7efa2 100644 --- a/exception_lists/pmodes +++ b/exception_lists/pmodes @@ -28,8 +28,18 @@ # Exception List for permission mode checking # +# +# NWAM Phase 1 -- nwamd running as netadm:netadm must be able to +# modify secobj.conf, which has ownership dladm:netadm. +# etc/dladm/secobj.conf + etc/dumpdates + +# +# Lp stuff is chmod'ed back by the lp system; prevent pkgchk errors +# later by listing them here. +# etc/lp etc/lp/classes etc/lp/forms @@ -37,6 +47,14 @@ etc/lp/interfaces etc/lp/ppd etc/lp/printers etc/lp/pwheels +var/lp +var/lp/logs +var/spool/lp +var/spool/lp/admins +var/spool/lp/requests +var/spool/lp/system + +# /var/adm stuff added because std cron jobs for sys/adm expect this var/adm var/adm/acct var/adm/acct/fiscal @@ -44,12 +62,9 @@ var/adm/acct/nite var/adm/acct/sum var/adm/sa var/adm/spellhist -var/lp -var/lp/logs -var/mail/:saved + +# sendmail 8.12 var/spool/clientmqueue -var/spool/lp -var/spool/lp/admins -var/spool/lp/requests -var/spool/lp/system + +var/mail/:saved var/spool/uucppublic diff --git a/usr/src/tools/pmodes/README.pmodes b/usr/src/tools/pmodes/README.pmodes index 668103cdae..da8152f1da 100644 --- a/usr/src/tools/pmodes/README.pmodes +++ b/usr/src/tools/pmodes/README.pmodes @@ -2,9 +2,8 @@ # CDDL HEADER START # # The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. # # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE # or http://www.opensolaris.org/os/licensing. @@ -19,16 +18,30 @@ # # CDDL HEADER END # -/* - * Copyright (c) 1999-2001 by Sun Microsystems, Inc. - * All rights reserved. - */ -#ident "%Z%%M% %I% %E% SMI" +# +# Copyright 2010 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. +# Pmodes is a program that updates pkgmap files or pkg prototype files. + +Applicability: + +Use of pmodes has been deprecated in onnv-gate; instead, see +validate_pkg, as delivered by developer/build/onbld, and +exception_lists/pmodes. + +Other OSNet users (ie on10 patch gates and earlier) should use pmodes +from their own workspace. + +The information here is suitable for pmodes users in other +consolidations, using tools from onnv-tools. + + + Usage: pmodes [-somwDeNndvqP] [-r file] directory .. proto/pkgmap file.... @@ -96,3 +109,11 @@ With the -d option, output looks like: And only one line per file is produced. + + +Exceptions + +If pmodes insists on flagging errors that you believe must be +integrated as-is, you may update the inline initializers for either +exceptions or exempt_pkgs in pmodes.c. If you do this, make sure that +the bug report and your RTI include a justification for the exception. diff --git a/usr/src/tools/pmodes/exceptions.h b/usr/src/tools/pmodes/exceptions.h deleted file mode 100644 index da3296fa95..0000000000 --- a/usr/src/tools/pmodes/exceptions.h +++ /dev/null @@ -1,126 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License (the "License"). - * You may not use this file except in compliance with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright 2010 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - * - * $Id: exceptions.h,v 1.11 2000/01/13 14:12:58 casper Exp $ - * - * List of files/directories supposed to be group/world writable - * May need to be updated for each OS release - * - */ - - "/etc/dumpdates", - "/etc/lp", - "/var/mail/:saved", - "/var/preserve", - /* - * Lp stuff is chmod'ed back by the lp system; prevent pkgchk errors - * later by listing them here. - */ - "/etc/lp/Systems", - "/etc/lp/classes", - "/etc/lp/forms", - "/etc/lp/interfaces", - "/etc/lp/ppd", - "/etc/lp/printers", - "/etc/lp/pwheels", - "/var/lp", - "/var/lp/logs", - "/var/spool/lp", - "/var/spool/lp/admins", - "/var/spool/lp/fifos", - "/var/spool/lp/fifos/private", - "/var/spool/lp/fifos/public", - "/var/spool/lp/requests", - "/var/spool/lp/system", - - /* CUPS */ - "/var/cache/cups", - - /* - * NWAM Phase 1 -- nwamd running as netadm:netadm must be able to - * modify secobj.conf, which has ownership dladm:netadm. - */ - "/etc/dladm/secobj.conf", - - /* another strange logfile */ - "/usr/oasys/tmp/TERRLOG", - - /* /var/adm stuff added because std cron jobs for sys/adm expect this */ - "/var/adm", - "/var/adm/acct", - "/var/adm/acct/fiscal", - "/var/adm/acct/nite", - "/var/adm/acct/sum", - "/var/adm/sa", - "/var/adm/spellhist", - - /* 5.1, 5.2 */ - "/devices/pseudo/clone:ip", - "/devices/pseudo/clone:ticlts", - "/devices/pseudo/clone:ticots", - "/devices/pseudo/clone:ticotsord", - "/devices/pseudo/clone:udp", - "/devices/pseudo/cn:console", - "/devices/pseudo/cn:syscon", - "/devices/pseudo/cn:systty", - "/devices/pseudo/log:conslog", - "/devices/pseudo/mm:null", - "/devices/pseudo/mm:zero", - "/devices/pseudo/sad:user", - "/devices/pseudo/sy:tty", - /* 5.3, 5.4, 5.5, ... */ - "/devices/pseudo/clone@0:ip", - "/devices/pseudo/clone@0:ticlts", - "/devices/pseudo/clone@0:ticots", - "/devices/pseudo/clone@0:ticotsord", - "/devices/pseudo/clone@0:udp", - "/devices/pseudo/clone@0:tcp", - "/devices/pseudo/clone@0:rts", - "/devices/pseudo/cn@0:console", - "/devices/pseudo/cn@0:syscon", - "/devices/pseudo/cn@0:systty", - "/devices/pseudo/ksyms@0:ksyms", - "/devices/pseudo/log@0:conslog", - "/devices/pseudo/mm@0:null", - "/devices/pseudo/mm@0:zero", - "/devices/pseudo/sad@0:user", - "/devices/pseudo/sy@0:tty", - - /* 5.6 .... */ - "/devices/pseudo/tl@0:ticlts", - "/devices/pseudo/tl@0:ticots", - "/devices/pseudo/tl@0:ticotsord", - - /* 5.8 (ipv6) ... */ - "/devices/pseudo/arp@0:arp", - "/devices/pseudo/ip6@0:ip6", - "/devices/pseudo/ip@0:ip", - "/devices/pseudo/rts@0:rts", - "/devices/pseudo/tcp6@0:tcp6", - "/devices/pseudo/tcp@0:tcp", - "/devices/pseudo/udp6@0:udp6", - "/devices/pseudo/udp@0:udp", - - /* 5.9 (sendmail 8.12) ... */ - "/var/spool/clientmqueue", diff --git a/usr/src/tools/pmodes/pmodes.c b/usr/src/tools/pmodes/pmodes.c index 15ea4eea99..6a83865f40 100644 --- a/usr/src/tools/pmodes/pmodes.c +++ b/usr/src/tools/pmodes/pmodes.c @@ -18,8 +18,9 @@ * * CDDL HEADER END */ + /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright 2010 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. * * $Id: pmodes.c,v 1.23 1999/03/22 14:51:16 casper Exp $ @@ -57,8 +58,6 @@ * Casper Dik (Casper.Dik@Holland.Sun.COM) */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include <stdio.h> #include <unistd.h> #include <string.h> @@ -71,7 +70,8 @@ #include "binsearch.h" static char *exceptions[] = { -#include "exceptions.h" + "/etc/lp", + "/var/cache/cups", }; static char *exempt_pkgs[] = { |