[Fai-commit] r4546 - trunk/bin

[lange at alioth.debian.org]

Author: lange
Date: 2007-08-30 15:59:20 +0000 (Thu, 30 Aug 2007)
New Revision: 4546

Modified:
   trunk/bin/faimond
Log:
do not allow ; in message (security), do not print ip and port number


Modified: trunk/bin/faimond
===================================================================
--- trunk/bin/faimond	2007-08-30 15:56:47 UTC (rev 4545)
+++ trunk/bin/faimond	2007-08-30 15:59:20 UTC (rev 4546)
@@ -126,7 +126,7 @@
       next;
     }
 
-    if ($inp =~ /^(\S+)\s+TASKEND install 0/ && $opt_b) {
+    if ($inp =~ /^([^\s;]+)\s+TASKEND install 0/ && $opt_b) {
       my $cname = $1;
       if ($useip) {
         $cname = $ip;
@@ -134,7 +134,7 @@
       system('fai-chboot', '-d', $cname);
       logline("$ip:$port: Disabling pxelinux configuration for $cname\n") or die "log: $!";
     }
-    logline("$ip:$port: $inp") or die "log: $!";
+    logline("$inp") or die "log: $!";
   }
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -