Index: trunk/packages/sipb-xen-console-server/debian/changelog
===================================================================
--- trunk/packages/sipb-xen-console-server/debian/changelog	(revision 1116)
+++ trunk/packages/sipb-xen-console-server/debian/changelog	(revision 1118)
@@ -1,2 +1,8 @@
+sipb-xen-console-server (2.7) unstable; urgency=low
+
+  * Don't run conserver as root; use sudo instead
+
+ -- Evan Broder <broder@mit.edu>  Tue, 14 Oct 2008 02:38:46 -0400
+
 sipb-xen-console-server (2.06.3) unstable; urgency=low
 
Index: trunk/packages/sipb-xen-console-server/debian/sipb-xen-console-server.postinst
===================================================================
--- trunk/packages/sipb-xen-console-server/debian/sipb-xen-console-server.postinst	(revision 1118)
+++ trunk/packages/sipb-xen-console-server/debian/sipb-xen-console-server.postinst	(revision 1118)
@@ -0,0 +1,44 @@
+#!/bin/sh
+# postinst script for sipb-xen-console-server
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postinst> `configure' <most-recently-configured-version>
+#        * <old-postinst> `abort-upgrade' <new version>
+#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+#          <new-version>
+#        * <postinst> `abort-remove'
+#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+#          <failed-install-package> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    configure)
+        cat >>/etc/sudoers <<EOF
+### BEGIN sipb-xen-console-server
+conservr ALL=(ALL) NOPASSWD: /usr/sbin/xm console d_*
+### END sipb-xen-console-server
+EOF
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
Index: trunk/packages/sipb-xen-console-server/debian/sipb-xen-console-server.prerm
===================================================================
--- trunk/packages/sipb-xen-console-server/debian/sipb-xen-console-server.prerm	(revision 1118)
+++ trunk/packages/sipb-xen-console-server/debian/sipb-xen-console-server.prerm	(revision 1118)
@@ -0,0 +1,39 @@
+#!/bin/sh
+# prerm script for sipb-xen-console-server
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <prerm> `remove'
+#        * <old-prerm> `upgrade' <new-version>
+#        * <new-prerm> `failed-upgrade' <old-version>
+#        * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
+#        * <deconfigured's-prerm> `deconfigure' `in-favour'
+#          <package-being-installed> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    remove|upgrade|deconfigure)
+        perl -i.bak -ne 's%^### (BEGIN|END) sipb-xen-console-server\s*$%%m && ($skip = ($1 eq "BEGIN")); print unless $skip;' /etc/sudoers
+    ;;
+
+    failed-upgrade)
+    ;;
+
+    *)
+        echo "prerm called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
Index: trunk/packages/sipb-xen-console-server/files/etc/conserver/conserver.cf.sipb-xen
===================================================================
--- trunk/packages/sipb-xen-console-server/files/etc/conserver/conserver.cf.sipb-xen	(revision 1116)
+++ trunk/packages/sipb-xen-console-server/files/etc/conserver/conserver.cf.sipb-xen	(revision 1118)
@@ -7,5 +7,5 @@
 	rw *;
 	type exec;
-	exec xm console d_f;
+	exec sudo xm console d_f;
 	execsubst f=cs;
 }
Index: trunk/packages/sipb-xen-console-server/files/etc/conserver/server.conf.sipb-xen
===================================================================
--- trunk/packages/sipb-xen-console-server/files/etc/conserver/server.conf.sipb-xen	(revision 1116)
+++ trunk/packages/sipb-xen-console-server/files/etc/conserver/server.conf.sipb-xen	(revision 1118)
@@ -1,2 +1,2 @@
 OPTS='-p 3109  '
-ASROOT=y
+ASROOT=