From patchwork Sat Aug 17 09:23:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ezra Buehler X-Patchwork-Id: 1973443 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.a=rsa-sha256 header.s=20230601 header.b=MVmSxXSO; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com (client-ip=2a00:1450:4864:20::23a; helo=mail-lj1-x23a.google.com; envelope-from=swupdate+bncbcj5d4vo6qmrbb6yqg3amgqet2zxqxi@googlegroups.com; receiver=patchwork.ozlabs.org) Received: from mail-lj1-x23a.google.com (mail-lj1-x23a.google.com [IPv6:2a00:1450:4864:20::23a]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4WmD1Y049Rz1yXb for ; Sat, 17 Aug 2024 19:23:27 +1000 (AEST) Received: by mail-lj1-x23a.google.com with SMTP id 38308e7fff4ca-2f03d84f79bsf23372101fa.2 for ; Sat, 17 Aug 2024 02:23:27 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1723886601; cv=pass; d=google.com; s=arc-20160816; b=TcJYv8aMV2C8uuNLKbyRhG5w3uBqKma8DW6GLBnaaXM5VAuXPBMhFL5hsvP2PTzdxC GXYwqgvMgE1uNNxI94X0tRMjbkvr6a3g5LwPYWaGWQQ5O2IVxoKLWaro0vTE4YXbvtJg anY8H94amW8RPdHZv7hebAteJpqJA1g553klDIVLC8mG7XHJB/phhMxiSxcOhDvHh9rP DNVysGB5m5Nxek0MULT8SqEcn8++FW46a9caxDMLN4fFBqvXA0edG/ErN0svFALLTTRg nMVSpt6BNq8sZMJ/5CD0yELud9vU7XNWxUYjVI/pg08Wo5GMKT4O45OsUwMZ9JQ9DM2u 8AGQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:message-id:date :subject:cc:to:from:sender:dkim-signature; bh=hhdtzUkGJvM8um0GNq7Iwt6Mgk/OQRNmfOhbsgc/sgo=; fh=cdIAEpD5CP0C+dqf9homArFEoTIv73PNMIfEuYBq51c=; b=SB3TjJcdTyY8hHSQm2A18qW+x+ZrZr9c8AaQodprT3VItw0E4YvRQDOsh82HW+wQBd JxPlMIQlhU18OnxVxj6Bsqm0UnCoqqCEreI6Nqsx+EWAdid8fwfYj1F7Kds7rPNgJryo iig8HMHyXeSwkqy577W6mZhoVuc9syn8M5hB+ozzSK9peMmj7LV510NuYQhW+xppVTbk PQqnQDc7MmWWn2zjzBPJpjn06L/gEycd9FmZMSEWjXhv0EuMxLxt9TWOO6wY85D52rqC wl9a6J6JktY26NUUV1wDy+ycb2j2YpQFtnEe1AYD+IpNP59qyNJ8YoNRN9JY3M4THRAu lFAg==; darn=patchwork.ozlabs.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@easyb-ch.20230601.gappssmtp.com header.s=20230601 header.b=NtPy6LMk; spf=neutral (google.com: 2a00:1450:4864:20::42a is neither permitted nor denied by best guess record for domain of ezra@easyb.ch) smtp.mailfrom=ezra@easyb.ch; dara=pass header.i=@googlegroups.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1723886601; x=1724491401; darn=patchwork.ozlabs.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:message-id:date:subject:cc:to:from :sender:from:to:cc:subject:date:message-id:reply-to; bh=hhdtzUkGJvM8um0GNq7Iwt6Mgk/OQRNmfOhbsgc/sgo=; b=MVmSxXSOTMyJN9TbqwhUtY1e8r3F6NI/K2P9F+9Lr9bHzNwLGly4igQ+IWy4OR3lUZ ifbecTUoFvF5JNAuD4u5tHiLYN7Gcz8eF0IXgDJUpiOl/XPScnWoYFvl/6HWzXPiaWg0 Kgf6Yjqw6nMERl0x030SXgei+pe8Bj5IR8xDOFBbNXDYRFsqPmjrOpMvGgpQNUIv4Fbt vmEixlFa6PtbIepGT6G9MZCQWJ0zvikhi+nzIInWgq7v7ai3IZU3sH0G5edZ9CW+MHu7 c3Qv8wImbVIaa7urt0Pi96WAqM9BEVhD8W6yuQe7fTpaX64JWkN7yjF62kmuuYfYdctV 778A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723886601; x=1724491401; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :message-id:date:subject:cc:to:from:x-beenthere:x-gm-message-state :sender:from:to:cc:subject:date:message-id:reply-to; bh=hhdtzUkGJvM8um0GNq7Iwt6Mgk/OQRNmfOhbsgc/sgo=; b=uF7e0hlYhD+ih9pIHUV48h57J79POMLV+cxqaMAE2SAwph07/4ZPn6JYfaBTxE42a+ IWKBeCeOrSp82p2cDRgXLvbOOow46kIYNLTjsG8zl3QIG9LdkGCuA+ql3Rf3WRMMg7yE gnXyOvv7m+7NxpPnn4qvOTYLTEREDa86tSmukd00KNFV0PUfEJPB46D/RDnhM2TJjpSS tQ54oOSj7544Zt1+K1ASIBU7qh7eG8yECT2PS3eTWWgL7BrTk/fl6zXXjDOsgdenu5LH ET11PG0ronAC3jt2HhEWYFMyP6uSorRlLpOVichIQkVkwiaAO0KEnBWxIHFysiP/yAiS mVJQ== Sender: swupdate@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCVBnU+63VrQzbuJGAnVr5chrumgQb0JMKIfr5Tx2ThVVPuXmfUVTHjkOvWvi9CFiEe5MwVjwJ4SLElYQefpumtNggIKb53G1EumABByYQ== X-Gm-Message-State: AOJu0YyeQygtwMjInAWcjblFOkuKfCaF45WoSZORP9mF2rFP4XaVGG4F ROYea+YNbEIhoyHkaob9taUW5t7aa2six9WJaoyk8PKyCJOvA8L2 X-Google-Smtp-Source: AGHT+IHvbeZ04Ag5QrIkp4LGBZRcDqlHrQLcwQpIzMwlGZUJ51Jo5iMyyDetoMnsg79X0UGIgyGfEw== X-Received: by 2002:a2e:819a:0:b0:2f3:b76c:25c4 with SMTP id 38308e7fff4ca-2f3be600e71mr35113151fa.37.1723886600225; Sat, 17 Aug 2024 02:23:20 -0700 (PDT) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a2e:2a43:0:b0:2f1:5dd9:1b08 with SMTP id 38308e7fff4ca-2f3b37d18dels1151581fa.2.-pod-prod-06-eu; Sat, 17 Aug 2024 02:23:17 -0700 (PDT) X-Received: by 2002:a2e:b887:0:b0:2ef:320e:cbe9 with SMTP id 38308e7fff4ca-2f3be578491mr37011261fa.9.1723886597352; Sat, 17 Aug 2024 02:23:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1723886597; cv=none; d=google.com; s=arc-20160816; b=tsraNRTJQN325Gnb6LmXfuuzNgsyWUUGeEsuVlFPxUh+oxnYW6dC3aXPWX4TUQ5VIw VZdNBRvrv7zuZ0gWUeV7VYmFFKgmZ4jH7x6IHBzKnNAyZQQ9F1cZmkIsFDmukmKeIDOu USTWuTGImt76hK2ainKJrpOLyFHwPUZ2qF1USGsLUuOqfx0q370sHCoBbHDw/x+xfCWm jk2c7FlIGQ2VDiPO6p9DF/+wILcB4UDmP0bOxRLoKdaqMKWPGHqmMQ5Ske4bCHy89ddg voHCe2CXhMifggwq7DYBOkaL/iscRk/KERrYJnxLbVTBQp3PeC6SULGA/7/S+NdOCsEF HvjQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:dkim-signature; bh=8fPxp+xfx9oILmWudrTVqxG2hcV9Y1uWmqlSTpuDam0=; fh=L5oZC+i8gYF4FZ2roUlxWk23oB85PpWoSBF5IYJuO28=; b=Mx3Tm/XNG/EJKfAT6YGhEyP5aCeom7UD2JqYmPoZUcgZfsyfCIFZEerYYaDy7FnHBX u4slLkCls2J85oqcJ/Cr3EM+TbCgVeYnuJqWn0EjjS1h+QA3THiSn3jSan8vT9PFVHV2 JT+KuDYGX/m383CAImDcQxFbtBvksv8BFSVugwOzTjWMlCngWKeW+gYOxAEyCbNOu6ph TEW4h8cELzgz/RJZAXlkCxLzhAWkyByRKJeIp8G8IdqTlwX5jvJcjW/oG9i0TkjiAX0r ixHi0yDYJ3XLtG0RVHMBen98JVzZ/xenxFI8J+YPpb//8KslNm+N9ry+zttlDjbS6EcK aVPQ==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@easyb-ch.20230601.gappssmtp.com header.s=20230601 header.b=NtPy6LMk; spf=neutral (google.com: 2a00:1450:4864:20::42a is neither permitted nor denied by best guess record for domain of ezra@easyb.ch) smtp.mailfrom=ezra@easyb.ch; dara=pass header.i=@googlegroups.com Received: from mail-wr1-x42a.google.com (mail-wr1-x42a.google.com. [2a00:1450:4864:20::42a]) by gmr-mx.google.com with ESMTPS id 38308e7fff4ca-2f3b77063fdsi1306521fa.4.2024.08.17.02.23.17 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 17 Aug 2024 02:23:17 -0700 (PDT) Received-SPF: neutral (google.com: 2a00:1450:4864:20::42a is neither permitted nor denied by best guess record for domain of ezra@easyb.ch) client-ip=2a00:1450:4864:20::42a; Received: by mail-wr1-x42a.google.com with SMTP id ffacd0b85a97d-371a939dab9so47868f8f.2 for ; Sat, 17 Aug 2024 02:23:17 -0700 (PDT) X-Received: by 2002:a05:600c:3586:b0:427:f1a9:cb06 with SMTP id 5b1f17b1804b1-429ed6300camr22175395e9.0.1723886595994; Sat, 17 Aug 2024 02:23:15 -0700 (PDT) Received: from localhost.localdomain ([77.109.191.117]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-429ded2931asm97122135e9.17.2024.08.17.02.23.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 17 Aug 2024 02:23:15 -0700 (PDT) From: Ezra Buehler To: swupdate@googlegroups.com Cc: Ezra Buehler Subject: [swupdate] [PATCH] suricatta: Fix nocheckcert configuration Date: Sat, 17 Aug 2024 11:23:14 +0200 Message-Id: <20240817092314.171600-1-ezra@easyb.ch> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-Original-Sender: ezra@easyb.ch X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@easyb-ch.20230601.gappssmtp.com header.s=20230601 header.b=NtPy6LMk; spf=neutral (google.com: 2a00:1450:4864:20::42a is neither permitted nor denied by best guess record for domain of ezra@easyb.ch) smtp.mailfrom=ezra@easyb.ch; dara=pass header.i=@googlegroups.com Precedence: list Mailing-list: list swupdate@googlegroups.com; contact swupdate+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: swupdate@googlegroups.com X-Google-Group-Id: 605343134186 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , From: Ezra Buehler Without this change, setting `nocheckcert = true`, as found in examples/configuration/swupdate.cfg, has no effect. Signed-off-by: Ezra Buehler --- corelib/server_utils.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/corelib/server_utils.c b/corelib/server_utils.c index e3842563..95b72a4f 100644 --- a/corelib/server_utils.c +++ b/corelib/server_utils.c @@ -19,6 +19,7 @@ int channel_settings(void *elem, void *data) { char tmp[128]; + bool tmp_bool; channel_data_t *chan = (channel_data_t *)data; GET_FIELD_INT(LIBCFG_PARSER, elem, "retry", @@ -35,6 +36,8 @@ int channel_settings(void *elem, void *data) if (strlen(tmp)) chan->retry_sleep = (unsigned int)strtoul(tmp, NULL, 10); + GET_FIELD_BOOL(LIBCFG_PARSER, elem, "nocheckcert", &tmp_bool); + chan->strictssl = !tmp_bool; GET_FIELD_STRING_RESET(LIBCFG_PARSER, elem, "cafile", tmp); if (strlen(tmp)) SETSTRING(chan->cafile, tmp);