--- rpms/e-smith-tinydns/sme9/e-smith-tinydns-2.4.0_add_hostname_following_dhcpdleases_hostname.patch	2014/06/17 23:11:11	1.2
+++ rpms/e-smith-tinydns/sme9/e-smith-tinydns-2.4.0_add_hostname_following_dhcpdleases_hostname.patch	2015/01/17 18:48:40	1.6
@@ -1,7 +1,7 @@
-diff -Nur e-smith-tinydns-2.4.0.old/createlinks e-smith-tinydns-2.4.0/createlinks
---- e-smith-tinydns-2.4.0.old/createlinks	2014-06-17 23:46:27.046462016 +0200
-+++ e-smith-tinydns-2.4.0/createlinks	2014-06-17 23:47:00.027649759 +0200
-@@ -26,3 +26,27 @@
+diff -Nur e-smith-tinydns-2.4.0/createlinks e-smith-tinydns-2.4.0.bz2388/createlinks
+--- e-smith-tinydns-2.4.0/createlinks	2006-03-14 23:01:42.000000000 +0100
++++ e-smith-tinydns-2.4.0.bz2388/createlinks	2015-01-17 18:02:35.489764844 +0100
+@@ -26,3 +26,19 @@
  service_link_enhanced("tinydns", "K65", "6");
  service_link_enhanced("tinydns", "K65", "0");
  service_link_enhanced("tinydns", "K65", "1");
@@ -10,16 +10,8 @@ diff -Nur e-smith-tinydns-2.4.0.old/crea
 +    for  my $event (qw( dhcp-dns ))
 +        {
 +        # services to launch on event
-+        safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/dnscache");
++        safe_symlink("sigusr1", "root/etc/e-smith/events/$event/services2adjust/dnscache");
 +        safe_symlink("sigusr1", "root/etc/e-smith/events/$event/services2adjust/tinydns");
-+        safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/dhcpd");
-+        safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/dhcp-dns");
-+        
-+        # actions to perform
-+        safe_symlink("../actions/dnscache-change", "root/etc/e-smith/events/$event/S20dnscache-change");
-+
-+        # Template to event
-+        templates2events("/var/service/tinydns/root/data", $event);
 +        }
 +
 +#creation of dhcp-dns service
@@ -29,47 +21,89 @@ diff -Nur e-smith-tinydns-2.4.0.old/crea
 +    service_link_enhanced("dhcp-dns", "K65", "0");
 +    service_link_enhanced("dhcp-dns", "K65", "1");
 +    safe_symlink("/var/service/dhcp-dns/", "root/service/dhcp-dns");
-diff -Nur e-smith-tinydns-2.4.0.old/root/etc/e-smith/db/configuration/defaults/dhcp-dns/status e-smith-tinydns-2.4.0/root/etc/e-smith/db/configuration/defaults/dhcp-dns/status
---- e-smith-tinydns-2.4.0.old/root/etc/e-smith/db/configuration/defaults/dhcp-dns/status	1970-01-01 01:00:00.000000000 +0100
-+++ e-smith-tinydns-2.4.0/root/etc/e-smith/db/configuration/defaults/dhcp-dns/status	2014-06-17 23:47:00.028649886 +0200
+diff -Nur e-smith-tinydns-2.4.0/root/etc/e-smith/db/configuration/defaults/dhcp-dns/status e-smith-tinydns-2.4.0.bz2388/root/etc/e-smith/db/configuration/defaults/dhcp-dns/status
+--- e-smith-tinydns-2.4.0/root/etc/e-smith/db/configuration/defaults/dhcp-dns/status	1970-01-01 01:00:00.000000000 +0100
++++ e-smith-tinydns-2.4.0.bz2388/root/etc/e-smith/db/configuration/defaults/dhcp-dns/status	2015-01-16 20:02:12.050969025 +0100
 @@ -0,0 +1 @@
 +enabled
-diff -Nur e-smith-tinydns-2.4.0.old/root/etc/e-smith/db/configuration/defaults/dhcp-dns/type e-smith-tinydns-2.4.0/root/etc/e-smith/db/configuration/defaults/dhcp-dns/type
---- e-smith-tinydns-2.4.0.old/root/etc/e-smith/db/configuration/defaults/dhcp-dns/type	1970-01-01 01:00:00.000000000 +0100
-+++ e-smith-tinydns-2.4.0/root/etc/e-smith/db/configuration/defaults/dhcp-dns/type	2014-06-17 23:47:00.029650013 +0200
+diff -Nur e-smith-tinydns-2.4.0/root/etc/e-smith/db/configuration/defaults/dhcp-dns/type e-smith-tinydns-2.4.0.bz2388/root/etc/e-smith/db/configuration/defaults/dhcp-dns/type
+--- e-smith-tinydns-2.4.0/root/etc/e-smith/db/configuration/defaults/dhcp-dns/type	1970-01-01 01:00:00.000000000 +0100
++++ e-smith-tinydns-2.4.0.bz2388/root/etc/e-smith/db/configuration/defaults/dhcp-dns/type	2015-01-16 20:02:12.050969025 +0100
 @@ -0,0 +1 @@
 +service
-diff -Nur e-smith-tinydns-2.4.0.old/root/etc/e-smith/events/actions/dnscache-change e-smith-tinydns-2.4.0/root/etc/e-smith/events/actions/dnscache-change
---- e-smith-tinydns-2.4.0.old/root/etc/e-smith/events/actions/dnscache-change	1970-01-01 01:00:00.000000000 +0100
-+++ e-smith-tinydns-2.4.0/root/etc/e-smith/events/actions/dnscache-change	2014-06-17 23:47:00.030650140 +0200
-@@ -0,0 +1,3 @@
-+#!/bin/sh
-+
-+/usr/bin/sv 1 /service/tinydns
-diff -Nur e-smith-tinydns-2.4.0.old/root/etc/e-smith/templates/var/service/tinydns/root/data/65dhcpARecords e-smith-tinydns-2.4.0/root/etc/e-smith/templates/var/service/tinydns/root/data/65dhcpARecords
---- e-smith-tinydns-2.4.0.old/root/etc/e-smith/templates/var/service/tinydns/root/data/65dhcpARecords	1970-01-01 01:00:00.000000000 +0100
-+++ e-smith-tinydns-2.4.0/root/etc/e-smith/templates/var/service/tinydns/root/data/65dhcpARecords	2014-06-17 23:52:49.434051111 +0200
-@@ -0,0 +1,48 @@
+diff -Nur e-smith-tinydns-2.4.0/root/etc/e-smith/templates/var/service/tinydns/root/data/65dhcpARecords e-smith-tinydns-2.4.0.bz2388/root/etc/e-smith/templates/var/service/tinydns/root/data/65dhcpARecords
+--- e-smith-tinydns-2.4.0/root/etc/e-smith/templates/var/service/tinydns/root/data/65dhcpARecords	1970-01-01 01:00:00.000000000 +0100
++++ e-smith-tinydns-2.4.0.bz2388/root/etc/e-smith/templates/var/service/tinydns/root/data/65dhcpARecords	2015-01-17 19:45:33.892642388 +0100
+@@ -0,0 +1,107 @@
 +{
-+    # we need perl-Text-DHCPparse rpm from Dag's repo
-+    use Text::DHCPparse;
-+
-+    # we need perl-Date-Manip to convert to a unix timestamp
-+    use Date::Manip qw /UnixDate/;
-+   
++    use strict;
++    use warnings;
++    use esmith::Logger;
++    use esmith::ConfigDB;
 +    # we need perl-Time-TAI64 for timestamp conversion
 +    use Time::TAI64 qw /unixtai64/;
++    # we need perl-Date-Manip to convert to a unix timestamp
++    use Date::Manip qw /UnixDate/;
++    use File::Copy;
++
++    my $DB = esmith::ConfigDB->open_ro or die ("cannot open configuration database");
++
++    #we start a hash for name because we don't want several same names & ip
++    my %allocated_name = ();
++    my %allocated_ip_dhcplease = ();
 +
 +    # copy of dhcpd.leases file to /tmp because working directly on the original
 +    # is not a good idea
-+    use File::Copy;
-+    copy('/var/lib/dhcpd/dhcpd.leases', '/tmp/dhcpd.leases');      
-+    
++    copy("/var/lib/dhcpd/dhcpd.leases","/tmp/tmpdhcpd.leases") 
++        or die ("Error dhcp-dns Service : Unable to copy the /var/lib/dhcpd/dhcpd.leases"); 
++
++   #we create a fonction because we want to write in log
++   sub log2messages
++   {
++       my $message = shift;
++       tie *FH, 'esmith::Logger';
++       print FH "$message";
++       close FH;
++   }
++
++
++   #Text::DHCPparse forked because it doesn't allow to retrieve the end of lease
++   #Only the start is found by the leaseparse of DHCPparse.pm s/starts/ends
++   sub leaseparse {
++   my $logfile = shift;
++   my ( %list, $ip );
++   open FILE, $logfile or die;
++
++   while (<FILE>) {
++      next if /^#|^$/;
++      if (/^lease (\d+\.\d+\.\d+\.\d+)/) {
++         $ip = $1; 
++         $list{$ip} = sprintf("%-17s", $ip);
++      }
++      /^\s*hardware ethernet (.*);/ && ($list{$ip} .= sprintf("%-19s", $1));
++      /^\s*ends \d (.*);/ && ($list{$ip} .= sprintf("%-21s", $1));
++      /^\s*(abandoned).*/ && ($list{$ip} .= sprintf("%-19s", $1));
++      /^\s*client-hostname "(.*)";/ && ($list{$ip} .= sprintf("%-17s", $1));
++   }
++
++   close FILE;
++
++   # make all entries 74 characters long to format properly
++   foreach (keys %list) {
++      #$list{$_} = sprintf("%-74s", $list{$_}) if (length$list{$_} < 76);
++      $list{$_} = sprintf("%-74.74s", $list{$_});
++   }
++
++   return \%list;
++}
++
 +    # now we parse the leases
-+    $return = leaseparse('/tmp/dhcpd.leases');
-+   
-+    # variable with local domain value (default is  mycompamy.local)
-+    my $localdomain = get_local_domainname;
++    my $return = leaseparse('/tmp/tmpdhcpd.leases');
++    my ($ip,$time,$mac,$name);
++
++    # variable with local domain value (default is  mycompamy.local) and retrieve the server name
++    my $localdomain = $DB->get_value('DomainName') or die ("Unable retrieve the DomainName property");
++    my $servername  = $DB->get_value('SystemName') or die ("Unable retrieve the SystemName property");
 +
 +    $OUT .= "# A records for dhcp hosts in $localdomain\n";
 +
@@ -77,9 +111,10 @@ diff -Nur e-smith-tinydns-2.4.0.old/root
 +        ($ip, $time, $mac, $name) = unpack("A17 A21 A19 A30", $return->{$_});
 +
 +        # when the dhcp lease is over $name is empty .. we want only non empty one
-+         if ( $name ne "" ) {
-+            # we skip also ips already allocated
-+            unless (exists $allocated_ips{$ip})
++        if ( $name ne "" ) 
++        {
++            # we skip also ips & names already allocated
++            unless (exists $allocated_ip_dhcplease{$ip} || exists $allocated_name{$name})
 +            {
 +                # Convert lease end time to the format expected as
 +                # see:  http://cr.yp.to/djbdns/tinydns-data.html
@@ -90,19 +125,30 @@ diff -Nur e-smith-tinydns-2.4.0.old/root
 +                # Determine TTL
 +                my $ttl = '';
 +                $ttl = 0 unless ($ts <= time);
-+                $OUT .= "=$name.$localdomain:$ip:$ttl:$endtai\n";
++                $OUT .= "=$name.$localdomain:$ip:$ttl:$endtai\n" unless ($name eq $servername);
++                log2messages("The hostname of this server ($servername) is already in use with a different IP address in /var/lib/dhcpd/dhcpd.leases")  
++                    if ($name eq $servername); 
 +            }
-+            $allocated_ips{$ip} = 1;
++
++            $allocated_ip_dhcplease{$ip} = 1;
++            $allocated_name{$name} ++;
++
++            log2messages("The hostname \"$name\"  has already been assigned an IP address in /var/lib/dhcpd/dhcpd.leases")  
++                if ($allocated_name{$name} >1);
 +        }
 +    }
 +    # remove the temp file
-+    system "rm -f /tmp/dhcpd.leases";
++    unlink "/tmp/tmpdhcpd.leases"
++      or log2messages("Error dhcp-dns Service : Unable to remove the /tmp/tmpdhcpd.leases");
 +}
-diff -Nur e-smith-tinydns-2.4.0.old/root/var/service/dhcp-dns/dhcp-dns e-smith-tinydns-2.4.0/root/var/service/dhcp-dns/dhcp-dns
---- e-smith-tinydns-2.4.0.old/root/var/service/dhcp-dns/dhcp-dns	1970-01-01 01:00:00.000000000 +0100
-+++ e-smith-tinydns-2.4.0/root/var/service/dhcp-dns/dhcp-dns	2014-06-17 23:47:00.031650267 +0200
-@@ -0,0 +1,33 @@
++
+diff -Nur e-smith-tinydns-2.4.0/root/var/service/dhcp-dns/dhcp-dns e-smith-tinydns-2.4.0.bz2388/root/var/service/dhcp-dns/dhcp-dns
+--- e-smith-tinydns-2.4.0/root/var/service/dhcp-dns/dhcp-dns	1970-01-01 01:00:00.000000000 +0100
++++ e-smith-tinydns-2.4.0.bz2388/root/var/service/dhcp-dns/dhcp-dns	2015-01-17 18:06:32.318810671 +0100
+@@ -0,0 +1,45 @@
 +#!/usr/bin/perl
++use strict;
++use warnings;
 +
 +my $lease_file = "/var/lib/dhcpd/dhcpd.leases";
 +
@@ -110,7 +156,16 @@ diff -Nur e-smith-tinydns-2.4.0.old/root
 +my $modtime = 0;
 +
 +# seconds to wait
-+my $update_freq = 15;
++my $update_freq = 30;
++
++#we create a function because we want to write in log
++sub log2messages
++   {
++        my $message = shift;
++        tie *FH, 'esmith::Logger';
++        print FH "$message";
++        close FH;
++   }
 +
 +###########################################################################
 +# Main Loop
@@ -124,8 +179,11 @@ diff -Nur e-smith-tinydns-2.4.0.old/root
 +  if ($stats[9] > $modtime) {
 +  
 +  	$modtime = $stats[9];
++        system ("/usr/bin/sv 1 /service/tinydns") ==0
++            or log2messages('Error service dhcp-dns : Unable to restart /service/tinydns');
 +
-+        system ("/usr/bin/sv 1 /service/tinydns");
++        system ("/usr/bin/sv 1 /service/dnscache") ==0
++            or log2messages('Error service dhcp-dns : Unable to do restart /service/dnscache');
 +  }
 +
 +  # wait till next check time
@@ -133,11 +191,9 @@ diff -Nur e-smith-tinydns-2.4.0.old/root
 +
 +} # end main
 +###########################################################################
-+
-+
-diff -Nur e-smith-tinydns-2.4.0.old/root/var/service/dhcp-dns/run e-smith-tinydns-2.4.0/root/var/service/dhcp-dns/run
---- e-smith-tinydns-2.4.0.old/root/var/service/dhcp-dns/run	1970-01-01 01:00:00.000000000 +0100
-+++ e-smith-tinydns-2.4.0/root/var/service/dhcp-dns/run	2014-06-17 23:47:00.032650394 +0200
+diff -Nur e-smith-tinydns-2.4.0/root/var/service/dhcp-dns/run e-smith-tinydns-2.4.0.bz2388/root/var/service/dhcp-dns/run
+--- e-smith-tinydns-2.4.0/root/var/service/dhcp-dns/run	1970-01-01 01:00:00.000000000 +0100
++++ e-smith-tinydns-2.4.0.bz2388/root/var/service/dhcp-dns/run	2015-01-16 20:02:12.055969339 +0100
 @@ -0,0 +1,4 @@
 +#!/bin/sh
 +