--- a/open-src/data/smf-rbac/Xserver	Fri May 01 15:15:17 2009 -0700
+++ b/open-src/data/smf-rbac/Xserver	Fri May 01 16:37:47 2009 -0700
@@ -1,6 +1,6 @@
 #!/bin/ksh93
 #
-# ident	"@(#)Xserver	1.7	09/02/26 SMI"
+# ident	"@(#)Xserver	1.8	09/05/01 SMI"
 #
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 #
@@ -49,7 +49,7 @@
 #
 
 DISPLAY="0"
-DEFDEPTH="24"
+DEFDEPTH=""
 CLASSES=""
 TCP_LISTEN=""
 SERVERARGS=""
@@ -183,11 +183,13 @@
 case ${XSERVER} in
     # Xsun based
     /usr/openwin/bin/*)
-	DEPTHARG="-defdepth ${DEFDEPTH}"
+	DEPTHARG="-defdepth ${DEFDEPTH:-24}"
 	;;
     # Xorg based
     /usr/X11/bin/*)
-	DEPTHARG="-depth ${DEFDEPTH}"
+	if [[ "${DEFDEPTH}" != "" ]] ; then
+	    DEPTHARG="-depth ${DEFDEPTH}"
+	fi
 	;;
 esac
 

--- a/open-src/data/smf-rbac/x11-server.xml.in	Fri May 01 15:15:17 2009 -0700
+++ b/open-src/data/smf-rbac/x11-server.xml.in	Fri May 01 16:37:47 2009 -0700
@@ -2,7 +2,7 @@
 <!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
 <!--
 
-Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the
@@ -89,8 +89,7 @@
 		 value='@DEFAULT_XSERVER@' />
                	<propval name='server_args' type='astring'	
 		 value='' />
-               	<propval name='default_depth' type='integer' 
-		 value='24' />
+               	<property name='default_depth' type='integer' />
                	<propval name='tcp_listen' type='boolean' 
 		 value='false' />
 		<propval name='value_authorization' type='astring'