--- a/usr/src/cmd/zoneadm/zoneadm.c	Fri Jul 22 16:18:39 2005 -0700
+++ b/usr/src/cmd/zoneadm/zoneadm.c	Fri Jul 22 17:26:42 2005 -0700
@@ -19,6 +19,7 @@
  *
  * CDDL HEADER END
  */
+
 /*
  * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
@@ -177,8 +178,7 @@
 static char *
 long_help(int cmd_num)
 {
-	if (cmd_num < CMD_MIN || cmd_num > CMD_MAX)
-		return ("");
+	assert(cmd_num >= CMD_MIN && cmd_num <= CMD_MAX);
 	switch (cmd_num) {
 		case CMD_HELP:
 			return (gettext("Print usage message."));
@@ -228,6 +228,7 @@
 			    "action."));
 	}
 	/* NOTREACHED */
+	return (NULL);
 }
 
 /*

--- a/usr/src/cmd/zonecfg/zonecfg.c	Fri Jul 22 16:18:39 2005 -0700
+++ b/usr/src/cmd/zonecfg/zonecfg.c	Fri Jul 22 17:26:42 2005 -0700
@@ -19,6 +19,7 @@
  *
  * CDDL HEADER END
  */
+
 /*
  * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
@@ -646,6 +647,7 @@
 			    "specification."));
 	}
 	/* NOTREACHED */
+	return (NULL);
 }
 
 /*

--- a/usr/src/cmd/zonecfg/zonecfg_grammar.y	Fri Jul 22 16:18:39 2005 -0700
+++ b/usr/src/cmd/zonecfg/zonecfg_grammar.y	Fri Jul 22 17:26:42 2005 -0700
@@ -19,8 +19,10 @@
  * information: Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
- *
- * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+ */
+
+/*
+ * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -106,14 +108,14 @@
 			num_prop_vals = 0;
 		}
 		if (YYRECOVERING())
-			return;
+			YYABORT;
 		yyclearin;
 		yyerrok;
 	}
 	| error terminator
 	{
 		if (YYRECOVERING())
-			return;
+			YYABORT;
 		yyclearin;
 		yyerrok;
 	}

--- a/usr/src/tools/scripts/bfu.sh	Fri Jul 22 16:18:39 2005 -0700
+++ b/usr/src/tools/scripts/bfu.sh	Fri Jul 22 17:26:42 2005 -0700
@@ -340,6 +340,7 @@
 # files to be preserved, ie unconditionally restored to "child" versions
 #
 preserve_files="
+	kernel/misc/amd64/sysinit
 	kernel/misc/sysinit
 	var/adm/aculog
 	var/adm/spellhist