diff -ruN smeserver-sane-0.1.orig/createlinks smeserver-sane-0.1/createlinks
--- smeserver-sane-0.1.orig/createlinks	2008-04-18 08:12:13.000000000 -0600
+++ smeserver-sane-0.1/createlinks	2008-04-18 08:00:45.000000000 -0600
@@ -4,13 +4,8 @@
 
 # config sane
 foreach (qw(
-    /etc/xinetd.conf
     /etc/sane.d/saned.conf
     ))
 {
-    templates2events($_, qw(remoteaccess-update bootstrap-console-save));
+    templates2events($_, qw(bootstrap-console-save));
 }
-
-safe_symlink("reload", "root/etc/e-smith/events/remoteaccess-update/services2adjust/xinetd");
-
-service_link_enhanced("xinetd", "S56", "7");
diff -ruN smeserver-sane-0.1.orig/root/etc/e-smith/db/accounts/migrate/80saned smeserver-sane-0.1/root/etc/e-smith/db/accounts/migrate/80saned
--- smeserver-sane-0.1.orig/root/etc/e-smith/db/accounts/migrate/80saned	2008-04-09 03:41:50.000000000 -0600
+++ smeserver-sane-0.1/root/etc/e-smith/db/accounts/migrate/80saned	1969-12-31 17:00:00.000000000 -0700
@@ -1,15 +0,0 @@
-
-{
-   my $group_sane = $DB->get('saned');
-   return "" if $group_sane;
-
-   $group_sane = $DB->new_record('saned', {type => 'group'});
-
-   $group_sane->set_prop('Description', 'saned');
-   $group_sane->set_prop('Members', 'saned');
-
-   unless ( system("/sbin/e-smith/signal-event group-create saned") == 0 )
-   {
-       die "group-create saned failed\n";
-   }
-}
\ No newline at end of file
diff -ruN smeserver-sane-0.1.orig/root/etc/e-smith/db/configuration/defaults/saned/access smeserver-sane-0.1/root/etc/e-smith/db/configuration/defaults/saned/access
--- smeserver-sane-0.1.orig/root/etc/e-smith/db/configuration/defaults/saned/access	1969-12-31 17:00:00.000000000 -0700
+++ smeserver-sane-0.1/root/etc/e-smith/db/configuration/defaults/saned/access	2008-04-18 07:33:28.000000000 -0600
@@ -0,0 +1 @@
+private
diff -ruN smeserver-sane-0.1.orig/root/etc/e-smith/db/configuration/defaults/saned/status smeserver-sane-0.1/root/etc/e-smith/db/configuration/defaults/saned/status
--- smeserver-sane-0.1.orig/root/etc/e-smith/db/configuration/defaults/saned/status	1969-12-31 17:00:00.000000000 -0700
+++ smeserver-sane-0.1/root/etc/e-smith/db/configuration/defaults/saned/status	2008-04-18 07:33:28.000000000 -0600
@@ -0,0 +1 @@
+enabled
diff -ruN smeserver-sane-0.1.orig/root/etc/e-smith/db/configuration/defaults/saned/TCPPort smeserver-sane-0.1/root/etc/e-smith/db/configuration/defaults/saned/TCPPort
--- smeserver-sane-0.1.orig/root/etc/e-smith/db/configuration/defaults/saned/TCPPort	1969-12-31 17:00:00.000000000 -0700
+++ smeserver-sane-0.1/root/etc/e-smith/db/configuration/defaults/saned/TCPPort	2008-04-18 07:33:28.000000000 -0600
@@ -0,0 +1 @@
+6566
diff -ruN smeserver-sane-0.1.orig/root/etc/e-smith/db/configuration/defaults/saned/type smeserver-sane-0.1/root/etc/e-smith/db/configuration/defaults/saned/type
--- smeserver-sane-0.1.orig/root/etc/e-smith/db/configuration/defaults/saned/type	1969-12-31 17:00:00.000000000 -0700
+++ smeserver-sane-0.1/root/etc/e-smith/db/configuration/defaults/saned/type	2008-04-18 07:33:28.000000000 -0600
@@ -0,0 +1 @@
+service
diff -ruN smeserver-sane-0.1.orig/root/etc/e-smith/db/configuration/defaults/sane-port/access smeserver-sane-0.1/root/etc/e-smith/db/configuration/defaults/sane-port/access
--- smeserver-sane-0.1.orig/root/etc/e-smith/db/configuration/defaults/sane-port/access	2008-04-18 08:12:13.000000000 -0600
+++ smeserver-sane-0.1/root/etc/e-smith/db/configuration/defaults/sane-port/access	1969-12-31 17:00:00.000000000 -0700
@@ -1 +0,0 @@
-private
diff -ruN smeserver-sane-0.1.orig/root/etc/e-smith/db/configuration/defaults/sane-port/status smeserver-sane-0.1/root/etc/e-smith/db/configuration/defaults/sane-port/status
--- smeserver-sane-0.1.orig/root/etc/e-smith/db/configuration/defaults/sane-port/status	2008-04-18 08:12:13.000000000 -0600
+++ smeserver-sane-0.1/root/etc/e-smith/db/configuration/defaults/sane-port/status	1969-12-31 17:00:00.000000000 -0700
@@ -1 +0,0 @@
-enabled
diff -ruN smeserver-sane-0.1.orig/root/etc/e-smith/db/configuration/defaults/sane-port/TCPPort smeserver-sane-0.1/root/etc/e-smith/db/configuration/defaults/sane-port/TCPPort
--- smeserver-sane-0.1.orig/root/etc/e-smith/db/configuration/defaults/sane-port/TCPPort	2008-04-18 08:12:13.000000000 -0600
+++ smeserver-sane-0.1/root/etc/e-smith/db/configuration/defaults/sane-port/TCPPort	1969-12-31 17:00:00.000000000 -0700
@@ -1 +0,0 @@
-6566
diff -ruN smeserver-sane-0.1.orig/root/etc/e-smith/db/configuration/defaults/sane-port/type smeserver-sane-0.1/root/etc/e-smith/db/configuration/defaults/sane-port/type
--- smeserver-sane-0.1.orig/root/etc/e-smith/db/configuration/defaults/sane-port/type	2008-04-18 08:12:13.000000000 -0600
+++ smeserver-sane-0.1/root/etc/e-smith/db/configuration/defaults/sane-port/type	1969-12-31 17:00:00.000000000 -0700
@@ -1 +0,0 @@
-service
diff -ruN smeserver-sane-0.1.orig/root/etc/e-smith/db/configuration/defaults/xinetd/status smeserver-sane-0.1/root/etc/e-smith/db/configuration/defaults/xinetd/status
--- smeserver-sane-0.1.orig/root/etc/e-smith/db/configuration/defaults/xinetd/status	2008-04-18 08:12:14.000000000 -0600
+++ smeserver-sane-0.1/root/etc/e-smith/db/configuration/defaults/xinetd/status	1969-12-31 17:00:00.000000000 -0700
@@ -1 +0,0 @@
-enabled
diff -ruN smeserver-sane-0.1.orig/root/etc/e-smith/db/configuration/defaults/xinetd/type smeserver-sane-0.1/root/etc/e-smith/db/configuration/defaults/xinetd/type
--- smeserver-sane-0.1.orig/root/etc/e-smith/db/configuration/defaults/xinetd/type	2008-04-18 08:12:13.000000000 -0600
+++ smeserver-sane-0.1/root/etc/e-smith/db/configuration/defaults/xinetd/type	1969-12-31 17:00:00.000000000 -0700
@@ -1 +0,0 @@
-service
diff -ruN smeserver-sane-0.1.orig/root/etc/e-smith/db/configuration/defaults/xinetd-sane/status smeserver-sane-0.1/root/etc/e-smith/db/configuration/defaults/xinetd-sane/status
--- smeserver-sane-0.1.orig/root/etc/e-smith/db/configuration/defaults/xinetd-sane/status	2008-04-18 08:12:14.000000000 -0600
+++ smeserver-sane-0.1/root/etc/e-smith/db/configuration/defaults/xinetd-sane/status	1969-12-31 17:00:00.000000000 -0700
@@ -1 +0,0 @@
-enabled
diff -ruN smeserver-sane-0.1.orig/root/etc/e-smith/db/configuration/defaults/xinetd-sane/type smeserver-sane-0.1/root/etc/e-smith/db/configuration/defaults/xinetd-sane/type
--- smeserver-sane-0.1.orig/root/etc/e-smith/db/configuration/defaults/xinetd-sane/type	2008-04-18 08:12:14.000000000 -0600
+++ smeserver-sane-0.1/root/etc/e-smith/db/configuration/defaults/xinetd-sane/type	1969-12-31 17:00:00.000000000 -0700
@@ -1 +0,0 @@
-service
diff -ruN smeserver-sane-0.1.orig/root/etc/e-smith/templates/etc/hosts.allow/20saned smeserver-sane-0.1/root/etc/e-smith/templates/etc/hosts.allow/20saned
--- smeserver-sane-0.1.orig/root/etc/e-smith/templates/etc/hosts.allow/20saned	2008-04-13 16:24:37.000000000 -0600
+++ smeserver-sane-0.1/root/etc/e-smith/templates/etc/hosts.allow/20saned	2008-04-18 08:11:24.000000000 -0600
@@ -1,3 +1,3 @@
 {
-    $DB->hosts_allow_spec('sane-port','saned');
+    $DB->hosts_allow_spec('saned','saned');
 }
diff -ruN smeserver-sane-0.1.orig/root/etc/e-smith/templates/etc/services/20saned-port smeserver-sane-0.1/root/etc/e-smith/templates/etc/services/20saned-port
--- smeserver-sane-0.1.orig/root/etc/e-smith/templates/etc/services/20saned-port	2008-04-13 16:40:25.000000000 -0600
+++ smeserver-sane-0.1/root/etc/e-smith/templates/etc/services/20saned-port	2008-04-18 08:11:39.000000000 -0600
@@ -1 +1 @@
-sane-port      { ${'sane-port'}{TCPPort} }/tcp               # SANE network scanner daemon
+saned          { ${'saned'}{TCPPort} }/tcp               # SANE network scanner daemon
diff -ruN smeserver-sane-0.1.orig/root/etc/e-smith/templates/etc/xinetd.conf/20sane-port smeserver-sane-0.1/root/etc/e-smith/templates/etc/xinetd.conf/20sane-port
--- smeserver-sane-0.1.orig/root/etc/e-smith/templates/etc/xinetd.conf/20sane-port	2008-04-13 16:23:43.000000000 -0600
+++ smeserver-sane-0.1/root/etc/e-smith/templates/etc/xinetd.conf/20sane-port	2008-04-18 08:11:34.000000000 -0600
@@ -1,11 +1,10 @@
 {
-return "" unless ( (${'xinetd-sane'}{'status'} || "disabled") eq "enabled");
+return "" unless ( (${'saned'}{'status'} || "disabled") eq "enabled");
 
 $OUT = <<HERE;
 
-service sane-port
+service saned
 {
-port = 6566
 socket_type = stream
 protocol = tcp
 user = root