From: J-N-K <github@klug.nrw>
Date: Sat, 25 May 2024 08:10:54 +0000 (+0200)
Subject: [snmp] Upgrade SNMP4J and fix AUTH_NO_PRIV (#16801)
X-Git-Url: https://git.basschouten.com/?a=commitdiff_plain;h=a177e699b3ca40af234cbac4d0e54a0b1bbb5e43;p=openhab-addons.git

[snmp] Upgrade SNMP4J and fix AUTH_NO_PRIV (#16801)

Signed-off-by: Jan N. Klug <github@klug.nrw>
---

diff --git a/bundles/org.openhab.binding.snmp/pom.xml b/bundles/org.openhab.binding.snmp/pom.xml
index 3ea0bd53aa..a53a670b5d 100644
--- a/bundles/org.openhab.binding.snmp/pom.xml
+++ b/bundles/org.openhab.binding.snmp/pom.xml
@@ -16,9 +16,9 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.servicemix.bundles</groupId>
-      <artifactId>org.apache.servicemix.bundles.snmp4j</artifactId>
-      <version>2.6.3_1</version>
+      <groupId>org.snmp4j</groupId>
+      <artifactId>snmp4j</artifactId>
+      <version>2.8.6</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>
diff --git a/bundles/org.openhab.binding.snmp/src/main/java/org/openhab/binding/snmp/internal/SnmpServiceImpl.java b/bundles/org.openhab.binding.snmp/src/main/java/org/openhab/binding/snmp/internal/SnmpServiceImpl.java
index d10d569bb8..86e223feb3 100644
--- a/bundles/org.openhab.binding.snmp/src/main/java/org/openhab/binding/snmp/internal/SnmpServiceImpl.java
+++ b/bundles/org.openhab.binding.snmp/src/main/java/org/openhab/binding/snmp/internal/SnmpServiceImpl.java
@@ -166,8 +166,10 @@ public class SnmpServiceImpl implements SnmpService {
     @Override
     public void addUser(String userName, SnmpAuthProtocol snmpAuthProtocol, @Nullable String authPassphrase,
             SnmpPrivProtocol snmpPrivProtocol, @Nullable String privPassphrase, byte[] engineId) {
-        UsmUser usmUser = new UsmUser(new OctetString(userName), snmpAuthProtocol.getOid(),
-                authPassphrase != null ? new OctetString(authPassphrase) : null, snmpPrivProtocol.getOid(),
+        UsmUser usmUser = new UsmUser(new OctetString(userName),
+                authPassphrase != null ? snmpAuthProtocol.getOid() : null,
+                authPassphrase != null ? new OctetString(authPassphrase) : null,
+                privPassphrase != null ? snmpPrivProtocol.getOid() : null,
                 privPassphrase != null ? new OctetString(privPassphrase) : null);
         OctetString securityNameOctets = new OctetString(userName);