File 2521-Remove-and-or-in-snmp.patch of Package erlang
From 49baef6ae0e516e6ce457135312fa9a6e00c5174 Mon Sep 17 00:00:00 2001
From: Maria Scott <maria-12648430@hnc-agency.org>
Date: Wed, 18 Feb 2026 12:15:49 +0100
Subject: [PATCH] Remove and/or in snmp
---
lib/snmp/src/agent/snmpa_conf.erl | 38 ++++++++++++-------------
lib/snmp/src/agent/snmpa_get.erl | 4 +--
lib/snmp/src/agent/snmpa_supervisor.erl | 6 ++--
lib/snmp/src/misc/snmp_config.erl | 8 ++----
lib/snmp/src/misc/snmp_log.erl | 4 +--
5 files changed, 25 insertions(+), 35 deletions(-)
diff --git a/lib/snmp/src/agent/snmpa_conf.erl b/lib/snmp/src/agent/snmpa_conf.erl
index 0582cc522e..7174833985 100644
--- a/lib/snmp/src/agent/snmpa_conf.erl
+++ b/lib/snmp/src/agent/snmpa_conf.erl
@@ -442,7 +440,7 @@ info.
Conf :: [agent_entry()].
write_agent_config(Dir, Hdr, Conf)
- when is_list(Dir) and is_list(Hdr) and is_list(Conf) ->
+ when is_list(Dir), is_list(Hdr), is_list(Conf) ->
Order = fun snmp_framework_mib:order_agent/2,
Check = fun snmp_framework_mib:check_agent/2,
Write = fun (Fd, Entries) -> write_agent_conf(Fd, Hdr, Entries) end,
@@ -462,7 +460,7 @@ info.
Conf :: [agent_entry()].
append_agent_config(Dir, Conf)
- when is_list(Dir) and is_list(Conf) ->
+ when is_list(Dir), is_list(Conf) ->
Order = fun snmp_framework_mib:order_agent/2,
Check = fun snmp_framework_mib:check_agent/2,
Write = fun write_agent_conf/2,
@@ -572,7 +570,7 @@ See [Contexts](snmp_agent_config_files.md#context) for more info.
Conf :: [context_entry()].
write_context_config(Dir, Hdr, Conf)
- when is_list(Dir) and is_list(Hdr) and is_list(Conf) ->
+ when is_list(Dir), is_list(Hdr), is_list(Conf) ->
Order = fun snmp_conf:no_order/2,
Check = fun check_context/2,
Write = fun (Fd, Entries) -> write_context_conf(Fd, Hdr, Entries) end,
@@ -591,7 +589,7 @@ See [Contexts](snmp_agent_config_files.md#context) for more info.
Conf :: [context_entry()].
append_context_config(Dir, Conf)
- when is_list(Dir) and is_list(Conf) ->
+ when is_list(Dir), is_list(Conf) ->
Order = fun snmp_conf:no_order/2,
Check = fun check_context/2,
Write = fun write_context_conf/2,
@@ -730,7 +728,7 @@ See [Community](snmp_agent_config_files.md#community) for more info.
Conf :: [community_entry()].
write_community_config(Dir, Hdr, Conf)
- when is_list(Dir) and is_list(Hdr) and is_list(Conf) ->
+ when is_list(Dir), is_list(Hdr), is_list(Conf) ->
Order = fun snmp_conf:no_order/2,
Check = fun check_community/2,
Write = fun (Fd, Entries) -> write_community_conf(Fd, Hdr, Entries) end,
@@ -749,7 +747,7 @@ See [Community](snmp_agent_config_files.md#community) for more info.
Conf :: [community_entry()].
append_community_config(Dir, Conf)
- when is_list(Dir) and is_list(Conf) ->
+ when is_list(Dir), is_list(Conf) ->
Order = fun snmp_conf:no_order/2,
Check = fun check_community/2,
Write = fun write_community_conf/2,
@@ -886,7 +884,7 @@ info.
Conf :: [standard_entry()].
write_standard_config(Dir, Hdr, Conf)
- when is_list(Dir) and is_list(Hdr) and is_list(Conf) ->
+ when is_list(Dir), is_list(Hdr), is_list(Conf) ->
Order = fun snmp_conf:no_order/2,
Check = fun check_standard/2,
Write = fun (Fd, Entries) -> write_standard_conf(Fd, Hdr, Entries) end,
@@ -906,7 +904,7 @@ info.
Conf :: [standard_entry()].
append_standard_config(Dir, Conf)
- when is_list(Dir) and is_list(Conf) ->
+ when is_list(Dir), is_list(Conf) ->
Order = fun snmp_conf:no_order/2,
Check = fun check_standard/2,
Write = fun write_standard_conf/2,
@@ -1242,7 +1240,7 @@ more info.
Conf :: [target_addr_entry()].
write_target_addr_config(Dir, Hdr, Conf)
- when is_list(Dir) and is_list(Hdr) and is_list(Conf) ->
+ when is_list(Dir), is_list(Hdr), is_list(Conf) ->
Order = fun snmp_conf:no_order/2,
Check = fun check_target_addr/2,
Write = fun (Fd, Entries) -> write_target_addr_conf(Fd, Hdr, Entries) end,
@@ -1262,7 +1260,7 @@ more info.
Conf :: [target_addr_entry()].
append_target_addr_config(Dir, Conf)
- when is_list(Dir) and is_list(Conf) ->
+ when is_list(Dir), is_list(Conf) ->
Order = fun snmp_conf:no_order/2,
Check = fun check_target_addr/2,
Write = fun write_target_addr_conf/2,
@@ -1474,7 +1472,7 @@ for more info.
Conf :: [target_params_entry()].
write_target_params_config(Dir, Hdr, Conf)
- when is_list(Dir) and is_list(Hdr) and is_list(Conf) ->
+ when is_list(Dir), is_list(Hdr), is_list(Conf) ->
Order = fun snmp_conf:no_order/2,
Check = fun check_target_params/2,
Write = fun (Fd, Entries) -> write_target_params_conf(Fd, Hdr, Entries) end,
@@ -1494,7 +1492,7 @@ for more info.
Conf :: [target_params_entry()].
append_target_params_config(Dir, Conf)
- when is_list(Dir) and is_list(Conf) ->
+ when is_list(Dir), is_list(Conf) ->
Order = fun snmp_conf:no_order/2,
Check = fun check_target_params/2,
Write = fun write_target_params_conf/2,
@@ -1600,7 +1598,7 @@ See [Notify Definitions](snmp_agent_config_files.md#notify) for more info.
Conf :: [notify_entry()].
write_notify_config(Dir, Hdr, Conf)
- when is_list(Dir) and is_list(Hdr) and is_list(Conf) ->
+ when is_list(Dir), is_list(Hdr), is_list(Conf) ->
Order = fun snmp_conf:no_order/2,
Check = fun check_notify/2,
Write = fun (Fd, Entries) -> write_notify_conf(Fd, Hdr, Entries) end,
@@ -1619,7 +1617,7 @@ See [Notify Definitions](snmp_agent_config_files.md#notify) for more info.
Conf :: [notify_entry()].
append_notify_config(Dir, Conf)
- when is_list(Dir) and is_list(Conf) ->
+ when is_list(Dir), is_list(Conf) ->
Order = fun snmp_conf:no_order/2,
Check = fun check_notify/2,
Write = fun write_notify_conf/2,
@@ -1779,7 +1777,7 @@ See [Security data for USM](snmp_agent_config_files.md#usm) for more info.
Conf :: [usm_entry()].
write_usm_config(Dir, Hdr, Conf)
- when is_list(Dir) and is_list(Hdr) and is_list(Conf) ->
+ when is_list(Dir), is_list(Hdr), is_list(Conf) ->
Order = fun snmp_conf:no_order/2,
Check = fun check_usm/2,
Write = fun (Fd, Entries) -> write_usm_conf(Fd, Hdr, Entries) end,
@@ -1798,7 +1796,7 @@ See [Security data for USM](snmp_agent_config_files.md#usm) for more info.
Conf :: [usm_entry()].
append_usm_config(Dir, Conf)
- when is_list(Dir) and is_list(Conf) ->
+ when is_list(Dir), is_list(Conf) ->
Order = fun snmp_conf:no_order/2,
Check = fun check_usm/2,
Write = fun write_usm_conf/2,
@@ -1986,7 +1984,7 @@ See [MIB Views for VACM](snmp_agent_config_files.md#vacm) for more info.
Conf :: [vacm_entry()].
write_vacm_config(Dir, Hdr, Conf)
- when is_list(Dir) and is_list(Hdr) and is_list(Conf) ->
+ when is_list(Dir), is_list(Hdr), is_list(Conf) ->
Order = fun snmp_conf:no_order/2,
Check = fun check_vacm/2,
Write = fun (Fd, Entries) -> write_vacm_conf(Fd, Hdr, Entries) end,
@@ -2005,7 +2003,7 @@ See [MIB Views for VACM](snmp_agent_config_files.md#vacm) for more info.
Conf :: [vacm_entry()].
append_vacm_config(Dir, Conf)
- when is_list(Dir) and is_list(Conf) ->
+ when is_list(Dir), is_list(Conf) ->
Order = fun snmp_conf:no_order/2,
Check = fun check_vacm/2,
Write = fun write_vacm_conf/2,
diff --git a/lib/snmp/src/agent/snmpa_get.erl b/lib/snmp/src/agent/snmpa_get.erl
index fd63feb1c5..f553da6302 100644
--- a/lib/snmp/src/agent/snmpa_get.erl
+++ b/lib/snmp/src/agent/snmpa_get.erl
@@ -1097,7 +1095,7 @@ do_get_bulk(MibView, NonRepeaters, MaxRepetitions,
{error, Idx, Reason} ->
?LIB:user_err("failed encoding varbind ~w:~n~p", [Idx, Reason]),
{genErr, Idx, []};
- {SizeLeft, Res} when is_integer(SizeLeft) and is_list(Res) ->
+ {SizeLeft, Res} when is_integer(SizeLeft), is_list(Res) ->
?vtrace("do_get_bulk -> encoded: "
"~n SizeLeft: ~p"
"~n Res: ~w", [SizeLeft, Res]),
diff --git a/lib/snmp/src/agent/snmpa_supervisor.erl b/lib/snmp/src/agent/snmpa_supervisor.erl
index 4c581f24d3..061563e9fe 100644
--- a/lib/snmp/src/agent/snmpa_supervisor.erl
+++ b/lib/snmp/src/agent/snmpa_supervisor.erl
@@ -636,7 +634,7 @@ erase(Key) ->
get_mibs(Mibs, Vsns) ->
MibDir = filename:join(code:priv_dir(snmp), "mibs"),
StdMib =
- case (lists:member(v2, Vsns) or lists:member(v3, Vsns)) of
+ case lists:member(v2, Vsns) orelse lists:member(v3, Vsns) of
true -> filename:join([MibDir, "SNMPv2-MIB"]);
false -> filename:join([MibDir, "STANDARD-MIB"])
end,
@@ -707,7 +705,7 @@ conf1(Dir, Vsns, Func) ->
snmp_notification_mib:Func(Dir),
?vdebug("~w snmp_view_based_acm_mib",[Func]),
snmp_view_based_acm_mib:Func(Dir),
- case lists:member(v1, Vsns) or lists:member(v2, Vsns) of
+ case lists:member(v1, Vsns) orelse lists:member(v2, Vsns) of
true ->
?vdebug("we need to handle v1 and/or v2 =>~n"
" ~w snmp_community_mib",[Func]),
diff --git a/lib/snmp/src/misc/snmp_config.erl b/lib/snmp/src/misc/snmp_config.erl
index 180debd363..7d1344197a 100644
--- a/lib/snmp/src/misc/snmp_config.erl
+++ b/lib/snmp/src/misc/snmp_config.erl
@@ -586,7 +584,7 @@ config_agent_snmp(Dir, Vsns) ->
"minimum",
fun verify_sec_type/1),
Passwd =
- case lists:member(v3, Vsns) and (SecType /= none) of
+ case lists:member(v3, Vsns) andalso (SecType /= none) of
true ->
ensure_crypto_started(),
ask("8b. Give a password of at least length 8. It is used to "
@@ -640,7 +638,7 @@ config_agent_snmp(Dir, Vsns) ->
"read/write~n"
" access to the \"internet\" subtree."),
i(" 3. Standard traps are sent to the manager."),
- case lists:member(v1, Vsns) or lists:member(v2, Vsns) of
+ case lists:member(v1, Vsns) orelse lists:member(v2, Vsns) of
true ->
i(" 4. Community \"public\" is mapped to security name"
" \"initial\"."),
@@ -1016,7 +1014,7 @@ default_dir(Component, DefDir) ->
IsManagerDir = is_members(ManagerConfs, Files),
Warning =
if
- IsAgentDir and IsManagerDir ->
+ IsAgentDir, IsManagerDir ->
"Note that the default directory contains both agent and manager config files";
IsAgentDir ->
"Note that the default directory contains agent config files";
diff --git a/lib/snmp/src/misc/snmp_log.erl b/lib/snmp/src/misc/snmp_log.erl
index 0082be5cbe..51bee916ec 100644
--- a/lib/snmp/src/misc/snmp_log.erl
+++ b/lib/snmp/src/misc/snmp_log.erl
@@ -958,7 +956,7 @@ dat2str({{Y,M,D},{H,Min,S}}) ->
timestamp_filter({Local,Universal},Start,Stop) ->
- tsf_ge(Local,Universal,Start) and tsf_le(Local,Universal,Stop);
+ tsf_ge(Local,Universal,Start) andalso tsf_le(Local,Universal,Stop);
timestamp_filter(_,_Start,_Stop) ->
true.
--
2.51.0
