--- src/common/gst-service-role.c	2007-10-13 19:20:29.000000000 +0200
+++ src/common/gst-service-role.c	2007-10-13 20:56:23.000000000 +0200
@@ -35,9 +35,9 @@
 	{ "acpid",                  GST_ROLE_POWER_MANAGEMENT },
 	{ "alsa",                   GST_ROLE_AUDIO_MANAGEMENT },
 	{ "alsa-utils",             GST_ROLE_AUDIO_MANAGEMENT },
+	{ "am-utils",               GST_ROLE_AUTOMOUNTER },
 	{ "amavis",                 GST_ROLE_ANTIVIRUS },
 	{ "amavis-ng",              GST_ROLE_ANTIVIRUS },
-	{ "am-utils",               GST_ROLE_AUTOMOUNTER },
 	{ "anacron",                GST_ROLE_COMMAND_SCHEDULER },
 	{ "apache",                 GST_ROLE_WEB_SERVER },
 	{ "apache-perl",            GST_ROLE_WEB_SERVER },
@@ -51,9 +51,11 @@
 	{ "aumix",                  GST_ROLE_AUDIO_MANAGEMENT },
 	{ "autofs",                 GST_ROLE_AUTOMOUNTER },
 	{ "avahi-daemon",           GST_ROLE_RENDEZVOUS },
+	{ "avahi-dnsconfd",           GST_ROLE_RENDEZVOUS },
 	{ "backuppc",               GST_ROLE_REMOTE_BACKUP },
-	{ "bind9",                  GST_ROLE_DNS },
+	{ "bftpd",                   GST_ROLE_FILE_SERVER_FTP },
 	{ "bind",                   GST_ROLE_DNS },
+	{ "bind9",                  GST_ROLE_DNS },
 	{ "bluetooth",              GST_ROLE_BLUETOOTH_MANAGEMENT },
 	{ "bpalogin",               GST_ROLE_TELSTRA_BIGPOND_NETWORK_CLIENT },
 	{ "brltty",                 GST_ROLE_BRAILLE_DISPLAY_MANAGEMENT },
@@ -62,31 +64,34 @@
 	{ "clamav-daemon",          GST_ROLE_ANTIVIRUS },
 	{ "clvm",                   GST_ROLE_CLUSTER_MANAGEMENT },
 	{ "cman",                   GST_ROLE_CLUSTER_MANAGEMENT },
-	{ "courier-authdaemon",     GST_ROLE_MTA_AUTH },
 	{ "courier",                GST_ROLE_MTA },
+	{ "courier-authdaemon",     GST_ROLE_MTA_AUTH },
 	{ "courier-mta",            GST_ROLE_MTA },
-	{ "crond",                  GST_ROLE_COMMAND_SCHEDULER },
+	{ "cpufreq",              GST_ROLE_CPUFREQ_MANAGEMENT },
 	{ "cron",                   GST_ROLE_COMMAND_SCHEDULER },
+	{ "crond",                  GST_ROLE_COMMAND_SCHEDULER },
+	{ "cups",                  GST_ROLE_PRINTER_SERVICE },
 	{ "cupsd",                  GST_ROLE_PRINTER_SERVICE },
 	{ "cupsys",                 GST_ROLE_PRINTER_SERVICE },
 	{ "dbus",                   GST_ROLE_DBUS },
 	{ "ddclient",               GST_ROLE_DYNAMIC_DNS_SERVICE },
 	{ "dhcp3-server",           GST_ROLE_DHCP_SERVER },
+	{ "dhcpd",           GST_ROLE_DHCP_SERVER },
 	{ "dhis-client",            GST_ROLE_DYNAMIC_DNS_SERVICE },
 	{ "dictd",                  GST_ROLE_DICTIONARY_SERVER },
 	{ "dovecot",                GST_ROLE_MTA },
 	{ "eagle-usb",              GST_ROLE_EAGLE_USB_MODEMS_MANAGEMENT },
 	{ "etc-setserial",          GST_ROLE_SERIAL_PORTS_MANAGEMENT },
 	{ "evms",                   GST_ROLE_LVM_MANAGEMENT },
-	{ "exim4",                  GST_ROLE_MTA },
 	{ "exim",                   GST_ROLE_MTA },
+	{ "exim4",                  GST_ROLE_MTA },
 	{ "fcron",                  GST_ROLE_COMMAND_SCHEDULER },
 	{ "festival",               GST_ROLE_SPEECH_SYNTHESIS },
 	{ "fetchmail",              GST_ROLE_MAIL_FETCHER },
 	{ "ftpd",                   GST_ROLE_FILE_SERVER_FTP },
 	{ "gdm",                    GST_ROLE_DISPLAY_MANAGER },
-	{ "gfs2-tools",             GST_ROLE_CLUSTER_MANAGEMENT },
 	{ "gfs-tools",              GST_ROLE_CLUSTER_MANAGEMENT },
+	{ "gfs2-tools",             GST_ROLE_CLUSTER_MANAGEMENT },
 	{ "gnbd-client",            GST_ROLE_CLUSTER_MANAGEMENT },
 	{ "gnbd-server",            GST_ROLE_CLUSTER_MANAGEMENT },
 	{ "hdparm",                 GST_ROLE_HDD_MANAGEMENT },
@@ -128,6 +133,8 @@
 	{ "nfs",                    GST_ROLE_FILE_SERVER_NFS },
 	{ "nfs-kernel-server",      GST_ROLE_FILE_SERVER_NFS },
 	{ "nfs-user-server",        GST_ROLE_FILE_SERVER_NFS },
+	{ "nfsd",                    GST_ROLE_FILE_SERVER_NFS },
+	{ "nfslock",                    GST_ROLE_FILE_SERVER_NFS },
 	{ "nis",                    GST_ROLE_NSS },
 	{ "ntp",                    GST_ROLE_NTP_SERVER },
 	{ "ntp-server",             GST_ROLE_NTP_SERVER },
@@ -156,8 +163,8 @@
 	{ "racoon",                 GST_ROLE_IPSEC_KEY_EXCHANGE_SERVER },
 	{ "radvd",                  GST_ROLE_ROUTER_ADVERTISEMENT_SERVER },
 	{ "rgmanager",              GST_ROLE_CLUSTER_MANAGEMENT },
-	{ "rsyncd",                 GST_ROLE_REMOTE_BACKUP },
 	{ "rsync",                  GST_ROLE_REMOTE_BACKUP },
+	{ "rsyncd",                 GST_ROLE_REMOTE_BACKUP },
 	{ "samba",                  GST_ROLE_FILE_SERVER_SMB },
 	{ "schoolbell",             GST_ROLE_WEB_CALENDAR_SERVER },
 	{ "schooltool",             GST_ROLE_SCHOOL_MANAGEMENT_PLATFORM },
@@ -170,8 +177,8 @@
 	{ "snmpd",                  GST_ROLE_SNMP_SERVER },
 	{ "spamassassin",           GST_ROLE_SPAM_FILTER },
 	{ "squid",                  GST_ROLE_PROXY_CACHE },
-	{ "ssh",                    GST_ROLE_SECURE_SHELL_SERVER },
 	{ "sshd",                   GST_ROLE_SECURE_SHELL_SERVER },
+	{ "ssh",                    GST_ROLE_SECURE_SHELL_SERVER },
 	{ "sysklogd",               GST_ROLE_SYSTEM_LOGGER },
 	{ "syslog",                 GST_ROLE_SYSTEM_LOGGER },
 	{ "tftpd-hpa",              GST_ROLE_FILE_SERVER_TFTP },