From 7ed6cbeee5160dfbb72bcc36091846d43379d35b Mon Sep 17 00:00:00 2001
From: Arne Welzel <arne.welzel@corelight.com>
Date: Tue, 20 Sep 2022 12:19:47 +0200
Subject: [PATCH] Make connection$service_violation a set[string]

To stay consistent with connection$service.
---
 scripts/base/frameworks/analyzer/dpd.zeek | 4 ++--
 src/strings.bif                           | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/scripts/base/frameworks/analyzer/dpd.zeek b/scripts/base/frameworks/analyzer/dpd.zeek
index 0d7b0cd233..921447f80e 100644
--- a/scripts/base/frameworks/analyzer/dpd.zeek
+++ b/scripts/base/frameworks/analyzer/dpd.zeek
@@ -48,7 +48,7 @@ redef record connection += {
 	dpd_state: State &optional;
 	## The set of services (analyzers) for which Zeek has observed a
 	## violation after the same service had previously been confirmed.
-	service_violation: set[AllAnalyzers::Tag] &default=set();
+	service_violation: set[string] &default=set();
 };
 
 event zeek_init() &priority=5
@@ -72,7 +72,7 @@ event analyzer_violation(c: connection, atype: AllAnalyzers::Tag, aid: count,
 		return;
 
 	delete c$service[analyzer];
-	add c$service_violation[atype];
+	add c$service_violation[analyzer];
 
 	local info: Info;
 	info$ts=network_time();
diff --git a/src/strings.bif b/src/strings.bif
index 05eb2dd8bf..26e20c5e78 100644
--- a/src/strings.bif
+++ b/src/strings.bif
@@ -151,7 +151,6 @@ function join_string_set%(ss: string_set, sep: string%): string
 		return val_mgr->EmptyString();
 		}
 
-	// Not sure we need to protect from this
 	const auto& it = ss->GetType()->AsTableType()->GetIndexTypes();
 	if ( it.size() != 1  || it[0]->Tag() != TYPE_STRING )
 		{