#
# old_revision [21f8d96bd9ec648aa740eda5f6ffb8edd508de77]
#
# patch "pf/lib/pf/node.pm"
#  from [940fd5d6f230a23da44554c2f0c9c96e61dded1b]
#    to [8b98784fc9dca687de6c0375fca37a07fe97174d]
#
============================================================
--- pf/lib/pf/node.pm	940fd5d6f230a23da44554c2f0c9c96e61dded1b
+++ pf/lib/pf/node.pm	8b98784fc9dca687de6c0375fca37a07fe97174d
@@ -733,9 +733,11 @@ sub nodes_maintenance {
 sub nodes_maintenance {
     my $logger = Log::Log4perl::get_logger('pf::node');
 
+    my $nodes_expire = $Config{'registration'}{'nodes_expire'};
     my $expire_mode = $Config{'registration'}{'expire_mode'};
-    $logger->debug("nodes_maintenance called with expire_mode=$expire_mode");
 
+    $logger->debug("nodes_maintenance called (expire_mode=$expire_mode | nodes_expire=$nodes_expire)");
+
     my $ungrace_query = db_query_execute(NODE, $node_statements, 'node_ungrace_sql') || return (0);
     while (my $row = $ungrace_query->fetchrow_hashref()) {
         my $currentMac = $row->{mac};
@@ -743,16 +745,18 @@ sub nodes_maintenance {
         $logger->info("modified $currentMac from status 'grace' to 'unreg'" );
     };
 
-    if ( isdisabled($expire_mode) ) {
-        return (1);
-    } else {
+    if ( !isdisabled($nodes_expire) ) {
         my $expire_unreg_query = db_query_execute(NODE, $node_statements, 'node_expire_unreg_field_sql') || return (0);
         while (my $row = $expire_unreg_query->fetchrow_hashref()) {
             my $currentMac = $row->{mac};
             pf_run("/usr/local/pf/bin/pfcmd manage deregister $currentMac");
             $logger->info("modified $currentMac from status 'reg' to 'unreg' based on unregdate colum" );
         }
+    }
 
+    if ( isdisabled($expire_mode) ) {
+        return (1);
+    } else {
         if ( ( lc($expire_mode) eq 'window' ) && $Config{'registration'}{'expire_window'} > 0 ) {
             my $expire_window_query = db_query_execute(
                 NODE, $node_statements, 'node_expire_window_sql', $Config{'registration'}{'expire_window'}