Index: xen-3.0.4-testing/tools/examples/init.d/sysconfig.xendomains
===================================================================
--- xen-3.0.4-testing.orig/tools/examples/init.d/sysconfig.xendomains
+++ xen-3.0.4-testing/tools/examples/init.d/sysconfig.xendomains
@@ -98,7 +98,6 @@ XENDOMAINS_RESTORE=true
 # Note that the script tries to be clever if both RESTORE and AUTO are 
 # set: It will first restore saved domains and then only start domains
 # in AUTO which are not running yet. 
-# Note that the name matching is somewhat fuzzy.
 #
 XENDOMAINS_AUTO=/etc/xen/auto
 
@@ -109,9 +108,8 @@ XENDOMAINS_AUTO=/etc/xen/auto
 # files in XENDOMAINS_AUTO will be treated according to XENDOMAINS_SYSRQ,
 # XENDOMAINS_MIGRATE, XENDOMAINS_SAVE, XENDMAINS_SHUTDOWN; otherwise
 # all running domains will be. 
-# Note that the name matching is somewhat fuzzy.
 # 
-XENDOMAINS_AUTO_ONLY=false
+XENDOMAINS_AUTO_ONLY=true
 
 ## Type: integer
 ## Default: 300
Index: xen-3.0.4-testing/tools/examples/xend-config.sxp
===================================================================
--- xen-3.0.4-testing.orig/tools/examples/xend-config.sxp
+++ xen-3.0.4-testing/tools/examples/xend-config.sxp
@@ -46,16 +46,19 @@
 #   (xen-api-server ((9363 pam '^localhost$ example\\.com$')
 #                    (unix none)))
 #
-# Default:
-#   (xen-api-server ((unix)))
+
+# Until the CIMOM supports authentication, do not require authentication on
+# the unix socket.  The socket is restricted to root via file permissions.
+(xen-api-server ((unix none)))
 
 
 #(xend-http-server no)
-#(xend-unix-server no)
+(xend-unix-server yes)
 #(xend-tcp-xmlrpc-server no)
 #(xend-unix-xmlrpc-server yes)
+# Only enable xend-relocation-server on trusted networks.  Currently
+# lacks encryption and authentication.
 #(xend-relocation-server no)
-(xend-relocation-server yes)
 
 #(xend-unix-path /var/lib/xend/xend-socket)