From f1d9e26755afc9c2c7741a3700cbe1afaa5303f7 Mon Sep 17 00:00:00 2001
From: Olof hagsand <olof@hagsand.se>
Date: Sun, 15 Sep 2024 11:34:28 +0200
Subject: [PATCH] Restconf: Notify ssl version on start SNMP: rm unused
 variables

---
 apps/restconf/restconf_main_native.c | 3 ++-
 apps/snmp/snmp_main.c                | 1 -
 apps/snmp/snmp_stream.c              | 5 -----
 test/test_restconf_plain_patch.sh    | 5 +++--
 4 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/apps/restconf/restconf_main_native.c b/apps/restconf/restconf_main_native.c
index 76c69880..6583ea39 100644
--- a/apps/restconf/restconf_main_native.c
+++ b/apps/restconf/restconf_main_native.c
@@ -1249,7 +1249,8 @@ main(int    argc,
         goto done;
 #endif
     clixon_debug_init(h, dbg);
-    clixon_log(h, LOG_NOTICE, "%s native %u Started", __PROGRAM__, getpid());
+    clixon_log(h, LOG_NOTICE, "%s native %u Started, SSL version:%lx", __PROGRAM__, getpid(), OPENSSL_VERSION_NUMBER);
+
     if (set_signal(SIGTERM, restconf_sig_term, NULL) < 0){
         clixon_err(OE_DAEMON, errno, "Setting signal");
         goto done;
diff --git a/apps/snmp/snmp_main.c b/apps/snmp/snmp_main.c
index a7d6601b..a401044e 100644
--- a/apps/snmp/snmp_main.c
+++ b/apps/snmp/snmp_main.c
@@ -108,7 +108,6 @@ clixon_snmp_sig_term(int arg)
 static int
 snmp_terminate(clixon_handle h)
 {
-    yang_stmt *yspec;
     cvec      *nsctx;
     cxobj     *x = NULL;
     char      *pidfile = clicon_snmp_pidfile(h);
diff --git a/apps/snmp/snmp_stream.c b/apps/snmp/snmp_stream.c
index 6e8a95e8..13899ea7 100644
--- a/apps/snmp/snmp_stream.c
+++ b/apps/snmp/snmp_stream.c
@@ -83,7 +83,6 @@ get_oid_for_yang_node(yang_stmt *ys,
     int        retval = -1;
     int        exist = 0;
     char      *oidstr = NULL;
-    char      *path;
     yang_stmt *ytype;
     yang_stmt *ypath;
     yang_stmt *yref;
@@ -293,7 +292,6 @@ snmp_stream_cb(int   s,
     int           eof;
     cxobj        *xtop = NULL;   /* top xml */
     cxobj        *xncont = NULL; /* notification content xml */
-    cxobj        *xn;            /* notification xml */
     cbuf         *cbmsg = NULL;
     int           ret;
 
@@ -321,8 +319,6 @@ snmp_stream_cb(int   s,
                 goto done;
         }
     }
-
- ok:
     retval = 0;
  done:
     clixon_debug(CLIXON_DBG_SNMP, "retval: %d", retval);
@@ -372,7 +368,6 @@ snmp_stream_subscribe(clixon_handle  h,
     }
     *socket = s;
     retval = 0;
-
  done:
     clixon_debug(CLIXON_DBG_SNMP, "retval: %d", retval);
     if (xret)
diff --git a/test/test_restconf_plain_patch.sh b/test/test_restconf_plain_patch.sh
index f8e70859..3bde6c83 100755
--- a/test/test_restconf_plain_patch.sh
+++ b/test/test_restconf_plain_patch.sh
@@ -197,8 +197,9 @@ wait_restconf
 new "Create album London Calling with PUT"
 expectpart "$(curl -u andy:bar $CURLOPTS -X PUT -H 'Content-Type: application/yang-data+json' $RCPROTO://localhost/restconf/data/example-jukebox:jukebox/library/artist=Clash/album=London%20Calling -d '{"example-jukebox:album":{"name":"London Calling"}}')" 0 "HTTP/$HVER 201"
 
-new "The message-body for a plain patch MUST be present"
-expectpart "$(curl -u andy:bar $CURLOPTS -X PATCH -H 'Content-Type: application/yang-data+json' $RCPROTO://localhost/restconf/data/example-jukebox:jukebox/library/artist=Beatles -d '')" 0 "HTTP/$HVER 400"
+#new "The message-body for a plain patch MUST be present"
+# XXX Hangs in SSL 3.3.2
+#expectpart "$(curl -u andy:bar $CURLOPTS -X PATCH -H 'Content-Type: application/yang-data+json' $RCPROTO://localhost/restconf/data/example-jukebox:jukebox/library/artist=Beatles -d '')" 0 "HTTP/$HVER 400" kalle
 
 # Plain patch can be used to create or update, but not delete, a child
 # resource within the target resource.