LDIRECTORD: rearange parsing of service to make it <= 80col (more often)

[Simon Horman <horms@xxxxxxxxxxxx>]

Cc: Roberto Nibali <ratz@xxxxxxxxxxxx>
Signed-off-by: Simon Horman <horms@xxxxxxxxxxxx>

Index: heartbeat/ldirectord/ldirectord.in
===================================================================
--- heartbeat.orig/ldirectord/ldirectord.in     2007-04-24 15:59:12.000000000 
+0900
+++ heartbeat/ldirectord/ldirectord.in  2007-04-24 15:59:18.000000000 +0900
@@ -1142,8 +1142,33 @@ sub read_config
                                                &config_error($line, "invalid 
protocol");
                                        }
                                } elsif ($rcmd =~ /^service\s*=\s*(.*)/) {
-                                       $1 =~ /(\w+)/ && ($1 eq "http" || $1 eq 
"https" || $1 eq "ldap" || $1 eq "ftp" || $1 eq "none" || $1 eq "smtp" || $1 eq 
"pop" || $1 eq "pops" || $1 eq "imap" || $1 eq "imaps" || $1 eq "nntp" || $1 eq 
"dns" || $1 eq "mysql" || $1 eq "pgsql" || $1 eq "radius" || $1 eq "sip")
-                                           or &config_error($line, "service 
must be http, https, ftp, smtp, pop, pops, imap, imaps, ldap, nntp, dns, mysql, 
pgsql, radius, sip, or none");
+                                       $1 =~ /(\w+)/ && ($1 eq "dns"   ||
+                                                         $1 eq "ftp"   ||
+                                                         $1 eq "http"  ||
+                                                         $1 eq "https" ||
+                                                         $1 eq "imap"  ||
+                                                         $1 eq "imaps" ||
+                                                         $1 eq "ldap"  ||
+                                                         $1 eq "nntp"  ||
+                                                         $1 eq "mysql" ||
+                                                         $1 eq "none"  ||
+                                                         $1 eq "pop"   ||
+                                                         $1 eq "pops"  ||
+                                                         $1 eq "radius"||
+                                                         $1 eq "pgsql" ||
+                                                         $1 eq "sip"   ||
+                                                         $1 eq "smtp")
+                                           or &config_error($line,
+                                                            "service must " .
+                                                            "be dns, ftp, " .
+                                                            "http, https, " .
+                                                            "imap, imaps, " .
+                                                            "ldap, nntp, "  .
+                                                            "mysql, none, " .
+                                                            "pop, pops, "   .
+                                                            "radius, "      .
+                                                            "pgsql, sip "   .
+                                                            "or smtp");
                                        $vsrv{service} = $1;
                                        if($vsrv{service} eq "ftp" and 
                                                        $vsrv{login} eq "") {

-- 

-- 
Horms
  H: http://www.vergenet.net/~horms/
  W: http://www.valinux.co.jp/en/