4963290 RFE: implement flexible zone administration that doesn't require uid=0 (fix copyright)
--- a/usr/src/cmd/oamuser/user/funcs.c Mon Jun 07 20:28:15 2010 -0600
+++ b/usr/src/cmd/oamuser/user/funcs.c Mon Jun 07 23:02:40 2010 -0700
@@ -19,7 +19,7 @@
* CDDL HEADER END
*/
/*
- * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
*/
#include <stdio.h>
--- a/usr/src/cmd/zlogin/Makefile Mon Jun 07 20:28:15 2010 -0600
+++ b/usr/src/cmd/zlogin/Makefile Mon Jun 07 23:02:40 2010 -0700
@@ -19,7 +19,7 @@
# CDDL HEADER END
#
#
-# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
#
PROG = zlogin
--- a/usr/src/cmd/zlogin/zlogin.c Mon Jun 07 20:28:15 2010 -0600
+++ b/usr/src/cmd/zlogin/zlogin.c Mon Jun 07 23:02:40 2010 -0700
@@ -19,7 +19,7 @@
* CDDL HEADER END
*/
/*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
*/
/*
--- a/usr/src/cmd/zonecfg/zonecfg.h Mon Jun 07 20:28:15 2010 -0600
+++ b/usr/src/cmd/zonecfg/zonecfg.h Mon Jun 07 23:02:40 2010 -0700
@@ -20,7 +20,7 @@
*/
/*
- * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
*/
#ifndef _ZONECFG_H
--- a/usr/src/cmd/zonecfg/zonecfg_grammar.y Mon Jun 07 20:28:15 2010 -0600
+++ b/usr/src/cmd/zonecfg/zonecfg_grammar.y Mon Jun 07 23:02:40 2010 -0700
@@ -21,7 +21,7 @@
*/
/*
- * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
*/
#include <stdio.h>
--- a/usr/src/cmd/zonecfg/zonecfg_lex.l Mon Jun 07 20:28:15 2010 -0600
+++ b/usr/src/cmd/zonecfg/zonecfg_lex.l Mon Jun 07 23:02:40 2010 -0700
@@ -21,7 +21,7 @@
*/
/*
- * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
*/
#include <string.h>
--- a/usr/src/head/auth_list.h Mon Jun 07 20:28:15 2010 -0600
+++ b/usr/src/head/auth_list.h Mon Jun 07 23:02:40 2010 -0700
@@ -20,7 +20,7 @@
*/
/*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
*
* This is an internal header file. Not to be shipped.
*/
--- a/usr/src/head/libzonecfg.h Mon Jun 07 20:28:15 2010 -0600
+++ b/usr/src/head/libzonecfg.h Mon Jun 07 23:02:40 2010 -0700
@@ -20,7 +20,7 @@
*/
/*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
*/
#ifndef _LIBZONECFG_H
--- a/usr/src/lib/brand/ipkg/zone/config.xml Mon Jun 07 20:28:15 2010 -0600
+++ b/usr/src/lib/brand/ipkg/zone/config.xml Mon Jun 07 23:02:40 2010 -0700
@@ -20,7 +20,7 @@
CDDL HEADER END
- Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
DO NOT EDIT THIS FILE.
-->
--- a/usr/src/lib/brand/labeled/zone/config.xml Mon Jun 07 20:28:15 2010 -0600
+++ b/usr/src/lib/brand/labeled/zone/config.xml Mon Jun 07 23:02:40 2010 -0700
@@ -20,7 +20,7 @@
CDDL HEADER END
- Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
DO NOT EDIT THIS FILE.
-->
--- a/usr/src/lib/brand/lx/zone/config.xml Mon Jun 07 20:28:15 2010 -0600
+++ b/usr/src/lib/brand/lx/zone/config.xml Mon Jun 07 23:02:40 2010 -0700
@@ -20,7 +20,7 @@
CDDL HEADER END
- Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
DO NOT EDIT THIS FILE.
-->
--- a/usr/src/lib/brand/sn1/zone/config.xml Mon Jun 07 20:28:15 2010 -0600
+++ b/usr/src/lib/brand/sn1/zone/config.xml Mon Jun 07 23:02:40 2010 -0700
@@ -20,7 +20,7 @@
CDDL HEADER END
- Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
DO NOT EDIT THIS FILE.
-->
--- a/usr/src/lib/brand/solaris10/zone/config.xml Mon Jun 07 20:28:15 2010 -0600
+++ b/usr/src/lib/brand/solaris10/zone/config.xml Mon Jun 07 23:02:40 2010 -0700
@@ -20,7 +20,7 @@
CDDL HEADER END
- Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
DO NOT EDIT THIS FILE.
-->
--- a/usr/src/lib/libbrand/common/libbrand.c Mon Jun 07 20:28:15 2010 -0600
+++ b/usr/src/lib/libbrand/common/libbrand.c Mon Jun 07 23:02:40 2010 -0700
@@ -20,7 +20,7 @@
*/
/*
- * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
*/
#include <assert.h>
--- a/usr/src/lib/libbrand/common/libbrand.h Mon Jun 07 20:28:15 2010 -0600
+++ b/usr/src/lib/libbrand/common/libbrand.h Mon Jun 07 23:02:40 2010 -0700
@@ -20,7 +20,7 @@
*/
/*
- * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
*/
#ifndef _LIBBRAND_H
--- a/usr/src/lib/libbrand/common/mapfile-vers Mon Jun 07 20:28:15 2010 -0600
+++ b/usr/src/lib/libbrand/common/mapfile-vers Mon Jun 07 23:02:40 2010 -0700
@@ -19,7 +19,7 @@
# CDDL HEADER END
#
#
-# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
#
#
--- a/usr/src/lib/libbrand/dtd/brand.dtd.1 Mon Jun 07 20:28:15 2010 -0600
+++ b/usr/src/lib/libbrand/dtd/brand.dtd.1 Mon Jun 07 23:02:40 2010 -0700
@@ -20,7 +20,7 @@
CDDL HEADER END
- Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
DO NOT EDIT THIS FILE.
-->
--- a/usr/src/lib/libzonecfg/common/libzonecfg.c Mon Jun 07 20:28:15 2010 -0600
+++ b/usr/src/lib/libzonecfg/common/libzonecfg.c Mon Jun 07 23:02:40 2010 -0700
@@ -20,7 +20,7 @@
*/
/*
- * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
*/
#include <libsysevent.h>
@@ -7746,7 +7746,8 @@
ZONE_AUTH_PREFIX, right);
if (getauthnam(authname) == NULL) {
status = B_FALSE;
- zerror(zonename, gettext("%s is not a valid right"),
+ zerror(zonename,
+ gettext("%s is not a valid authorization"),
right);
}
right = strtok_r(NULL, ",", &lasts);