From b0bdfbd4a8ec0fddf53b73412b2ae2a02c1e7a0c Mon Sep 17 00:00:00 2001 From: chrism9876 Date: Mon, 16 Mar 2026 13:47:01 +0000 Subject: [PATCH 1/2] Update fixBootstrapToken.sh --- macOS/Config/Bootstrap Token/fixBootstrapToken.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/macOS/Config/Bootstrap Token/fixBootstrapToken.sh b/macOS/Config/Bootstrap Token/fixBootstrapToken.sh index 4a5526c5..e7f5ed7b 100644 --- a/macOS/Config/Bootstrap Token/fixBootstrapToken.sh +++ b/macOS/Config/Bootstrap Token/fixBootstrapToken.sh @@ -40,10 +40,6 @@ function print_status { fi } -# Check if the boostrap token was ever escrowed. If not, stop early as success. -if echo "profiles status -type bootstraptoken" | grep -q "Bootstrap Token escrowed to server: NO"; then - exit 0 -fi # Check if we escrowed successfully in the past. If so, stop early as success. if cat "$logdir/checkBootstrapEscrow.log" | grep -q "Bootstrap Token validated."; then From 9905fa765b0cfa59ce73060adba33fbe8a355f89 Mon Sep 17 00:00:00 2001 From: chrism9876 Date: Mon, 16 Mar 2026 14:21:25 +0000 Subject: [PATCH 2/2] Refactor bootstrap token script to simplify checks Removed early exit checks for escrow success and secure token validation. --- macOS/Config/Bootstrap Token/fixBootstrapToken.sh | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/macOS/Config/Bootstrap Token/fixBootstrapToken.sh b/macOS/Config/Bootstrap Token/fixBootstrapToken.sh index e7f5ed7b..804eebc1 100644 --- a/macOS/Config/Bootstrap Token/fixBootstrapToken.sh +++ b/macOS/Config/Bootstrap Token/fixBootstrapToken.sh @@ -41,22 +41,7 @@ function print_status { } -# Check if we escrowed successfully in the past. If so, stop early as success. -if cat "$logdir/checkBootstrapEscrow.log" | grep -q "Bootstrap Token validated."; then - exit 0 -fi -# Fail early if the account provided does not have secure token enabled -if echo "$SECURE_TOKEN_STATUS" | grep -q "Secure token is DISABLED"; then - echo "$(date) | Secure token is disabled for $ADMIN_USERNAME. Not proceeding." - exit 1 -fi - -# Fail early if the account provided is not a valid username -if echo "$SECURE_TOKEN_STATUS" | grep -q "Unknown user"; then - echo "$(date) | Unknown user $ADMIN_USERNAME. Not proceeding." - exit 1 -fi # Check Bootstrap Token status BOOTSTRAP_TOKEN_STATUS=$(profiles validate -type bootstraptoken -user $ADMIN_USERNAME -password $ADMIN_PASSWORD 2>&1)