Bug 844800 - TPS should provide the ability to not allow tokens marked as 'Terminated' to be formatted and reused.

1 files changed, 12 insertions, 8 deletions

diff --git a/base/tps/src/processor/RA_Processor.cpp b/base/tps/src/processor/RA_Processor.cpp
index a9947555b..5395d82b9 100644
--- a/base/tps/src/processor/RA_Processor.cpp
+++ b/base/tps/src/processor/RA_Processor.cpp
@@ -2753,16 +2753,20 @@ RA_Status RA_Processor::Format(RA_Session *session, NameValueSet *extensions, bo
     }
 
     if (RA::ra_is_token_present(cuid)) {
+        int token_status = RA::ra_get_token_status(cuid);
+
        RA::Debug("RA_Processor::Format",
-	      "Found token %s", cuid);
+              "Found token %s status %d", cuid, token_status);
 
-      if (RA::ra_is_tus_db_entry_disabled(cuid)) {
-        RA::Error("RA_Format_Processor::Process",
-                        "CUID %s Disabled", cuid);
-        status = STATUS_ERROR_DISABLED_TOKEN;
-        PR_snprintf(audit_msg, 512, "CUID %s Disabled, status=STATUS_ERROR_DISABLED_TOKEN", cuid);
-        goto loser;
-      }
+      // Check for transition to 0/UNINITIALIZED status.
+      
+      if (token_status == -1 || !RA::transition_allowed(token_status, 0)) {
+          RA::Error("RA_Format_Processor::Process",
+              "Operation for CUID %s Disabled", cuid);
+              status = STATUS_ERROR_DISABLED_TOKEN;
+              PR_snprintf(audit_msg, 512, "Operation for CUID %s Disabled, illegal transition attempted %d:%d.", cuid, token_status, 0);
+              goto loser;
+      }  
     } else {
        RA::Debug("RA_Processor::Format",
 	      "Not Found token %s", cuid);