diff --git a/Source/santactl/Commands/SNTCommandRule.m b/Source/santactl/Commands/SNTCommandRule.m index e270e701d..16c3d79a3 100644 --- a/Source/santactl/Commands/SNTCommandRule.m +++ b/Source/santactl/Commands/SNTCommandRule.m @@ -451,7 +451,7 @@ - (void)exportJSONFile:(NSString *)jsonFilePath { NSMutableArray *rulesAsDicts = [[NSMutableArray alloc] init]; for (SNTRule *rule in rules) { - // Omit transitive and remove rules as they're not relevan. + // Omit transitive and remove rules as they're not relevant. if (rule.state == SNTRuleStateAllowTransitive || rule.state == SNTRuleStateRemove) { continue; } diff --git a/Source/santactl/Commands/SNTCommandStatus.m b/Source/santactl/Commands/SNTCommandStatus.m index beab69bcc..9044ba0d6 100644 --- a/Source/santactl/Commands/SNTCommandStatus.m +++ b/Source/santactl/Commands/SNTCommandStatus.m @@ -200,6 +200,7 @@ - (void)runWithArguments:(NSArray *)arguments { @"daemon" : @{ @"driver_connected" : @(YES), @"mode" : clientMode ?: @"null", + @"transitive_rules" : @(enableTransitiveRules), @"log_type" : eventLogType, @"file_logging" : @(fileLogging), @"watchdog_cpu_events" : @(cpuEvents), @@ -229,7 +230,6 @@ - (void)runWithArguments:(NSArray *)arguments { @"last_successful_rule" : ruleSyncLastSuccessStr ?: @"null", @"push_notifications" : pushNotifications ? @"Connected" : @"Disconnected", @"bundle_scanning" : @(enableBundles), - @"transitive_rules" : @(enableTransitiveRules), }, } mutableCopy]; @@ -262,6 +262,11 @@ - (void)runWithArguments:(NSArray *)arguments { } else { printf(">>> Daemon Info\n"); printf(" %-25s | %s\n", "Mode", [clientMode UTF8String]); + + if (enableTransitiveRules) { + printf(" %-25s | %s\n", "Transitive Rules", (enableTransitiveRules ? "Yes" : "No")); + } + printf(" %-25s | %s\n", "Log Type", [eventLogType UTF8String]); printf(" %-25s | %s\n", "File Logging", (fileLogging ? "Yes" : "No")); printf(" %-25s | %s\n", "USB Blocking", (blockUSBMount ? "Yes" : "No")); @@ -310,7 +315,6 @@ - (void)runWithArguments:(NSArray *)arguments { printf(" %-25s | %s\n", "Push Notifications", (pushNotifications ? "Connected" : "Disconnected")); printf(" %-25s | %s\n", "Bundle Scanning", (enableBundles ? "Yes" : "No")); - printf(" %-25s | %s\n", "Transitive Rules", (enableTransitiveRules ? "Yes" : "No")); } if (exportMetrics) {