--- rpms/e-smith-hosts/sme9/e-smith-hosts-2.4.0.comment_hostname_validator.patch	2015/01/21 21:53:44	1.2
+++ rpms/e-smith-hosts/sme9/e-smith-hosts-2.4.0.comment_hostname_validator.patch	2015/01/22 07:35:32	1.3
@@ -1,19 +1,16 @@
 diff -Nur e-smith-hosts-2.4.0.old8723/root/etc/e-smith/db/hosts/migrate/30sanitise_host_comment e-smith-hosts-2.4.0.bz8723/root/etc/e-smith/db/hosts/migrate/30sanitise_host_comment
 --- e-smith-hosts-2.4.0.old8723/root/etc/e-smith/db/hosts/migrate/30sanitise_host_comment	1970-01-01 01:00:00.000000000 +0100
-+++ e-smith-hosts-2.4.0.bz8723/root/etc/e-smith/db/hosts/migrate/30sanitise_host_comment	2015-01-21 22:49:42.441035251 +0100
-@@ -0,0 +1,13 @@
++++ e-smith-hosts-2.4.0.bz8723/root/etc/e-smith/db/hosts/migrate/30sanitise_host_comment	2015-01-22 08:30:50.193365257 +0100
+@@ -0,0 +1,10 @@
 +{
-+    #Added for bug 8723 & bug 8806
-+    my @hosts  = $DB->keys;
-+    foreach my $host (@hosts)
-+    {
-+        my $comment = $DB->get_prop("$host",'Comment')||'';
-+        if ($comment ne '')
-+        {
-+            $comment =~ s/['"]//g;
-+            $DB->set_prop("$host",'Comment',"$comment");
-+        }
-+    }
++      # Purge quoting chars in comments to fix bug 8723 & bug 8806
++      foreach my $host ($DB->get_all)
++      {
++          my $comment = $host->prop('Comment');
++          next unless $comment;
++          $comment =~ s/['"]//g;
++          $host->merge_props(Comment => $comment);
++      }
 +}
 diff -Nur e-smith-hosts-2.4.0.old8723/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/hostentries e-smith-hosts-2.4.0.bz8723/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/hostentries
 --- e-smith-hosts-2.4.0.old8723/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/hostentries	2015-01-18 11:25:40.356221775 +0100