# HG changeset patch
# User Tero Marttila <terom@paivola.fi>
# Date 1360532107 -7200
# Node ID feae2f0ff91a79dd35b97bf4dbff2b3ba4bfbba6
# Parent  c0dbd44bd463d229ccfb9da14cdecb8be953eb92# Parent  a0dedd0889f06964b19f5f8e9079b9cd947955ed
merge

diff -r c0dbd44bd463 -r feae2f0ff91a pvl/dhcp/leases.py
--- a/pvl/dhcp/leases.py	Sun Feb 10 23:27:04 2013 +0200
+++ b/pvl/dhcp/leases.py	Sun Feb 10 23:35:07 2013 +0200
@@ -428,15 +428,15 @@
 
         # count by state
         starts = lease.get('starts')
-        state = lease.get('binding-state', 'unknown')
+        state = lease.get('binding-state')
         next_state = lease.get('next-binding-state')
         ends = lease.get('ends')
 
         #log.debug("%-15s: %s: %8s -> %-8s: %s", ip, starts, state, next_state or '', ends)
-
+        
+        # XXX: datetime UTC or local?
         if next_state and ends and ends < datetime.now() :
-            # XXX: mark as, "expired", even they next-binding-state is probably "free"
-            state = 'expired' # lease['next-binding-state']
+            state = next_state
 
         return state