--- lib/PXElator/dhcpd.pm	2009/08/19 17:01:20	267
+++ lib/PXElator/dhcpd.pm	2009/09/08 16:54:35	393
@@ -54,6 +54,7 @@
 
 	if ( $ip = client::ip_from_mac( $mac ) ) {
 		print "RENEW $mac $ip\n";
+		client::save_ip_mac( $ip, $mac );
 		return $ip;
 	} elsif ( in_our_range( $request_ip ) ) {
 		$ip = client::next_ip( $mac );
@@ -105,13 +106,13 @@
 
 	$dhcp->comment( $transaction++ );
 
-	my $mac = substr($dhcp->chaddr(),0,$dhcp->hlen()*2);
+	my $mac = format::mac( substr($dhcp->chaddr(),0,$dhcp->hlen()*2) );
 	my $ip = client_mac_ip($mac, $dhcp->ciaddr);
 
 	my $hostname = $dhcp->getOptionValue(DHO_HOST_NAME);
-	print "$ip ", client::conf( $ip => 'hostname', default => $hostname ), " >> /etc/hosts\n";
+	print "$ip ", client::conf( $ip => 'hostname', default => $hostname ), " >> /etc/hosts\n" if $hostname;
 
-	my $audit = { mac => format::mac($mac), ip => $ip, hostname => $hostname,
+	my $audit = { mac => $mac, ip => $ip, hostname => $hostname,
 		options => {
 			map {
 				( $_ => $dhcp->getOptionValue( $_ ) )
@@ -150,7 +151,7 @@
 	my $options = {
 		DHO_SUBNET_MASK()	=> $server::netmask,
 		DHO_ROUTERS()		=> $server::ip,
-		DHO_DOMAIN_NAME()	=> $server::domain_name,
+		DHO_DOMAIN_NAME()	=> $server::domain,
 		DHO_NAME_SERVERS()	=> $server::ip,
 		DHO_DOMAIN_NAME_SERVERS() => $server::ip,
 		DHO_HOST_NAME()		=> client::conf( $ip, 'hostname' ),