From f82ce896a92c1683af9ca2b5dbbb91a3448474c7 Mon Sep 17 00:00:00 2001
From: Olof hagsand <olof@hagsand.se>
Date: Wed, 9 Nov 2022 16:39:00 +0100
Subject: [PATCH] Typos and docker test fix for ubuntu-22.04

---
 CHANGELOG.md                      |  1 +
 apps/backend/backend_commit.c     |  1 -
 lib/src/clixon_validate_minmax.c  |  2 +-
 test/test_netconf_ssh_callhome.sh | 14 ++++++++++++--
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1be1d8dd..402e541e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -77,6 +77,7 @@ Developers may need to change their code
     * Added three-value return.
     * Code need to be changed from: checking for `<0` to `<1` to keep same semantics
   * Added `skiptop` parameter to `xml2json_vec()`
+  * Added `xe` argument to `candidate_commit` for confirmed commit extra parameters
   
 ### Minor features
 
diff --git a/apps/backend/backend_commit.c b/apps/backend/backend_commit.c
index 7af3470e..bd5aed49 100644
--- a/apps/backend/backend_commit.c
+++ b/apps/backend/backend_commit.c
@@ -642,7 +642,6 @@ candidate_validate(clicon_handle h,
  * do something more drastic?
  * @param[in]  h          Clicon handle
  * @param[in]  xe         Request: <rpc><xn></rpc>  (or NULL)
- * @param[in]  session_id Client session id, only if xe
  * @param[in]  db         A candidate database, not necessarily "candidate"
  * @param[out] cbret      Return xml tree, eg <rpc-reply>..., <rpc-error.. 
  * @retval    -1          Error - or validation failed 
diff --git a/lib/src/clixon_validate_minmax.c b/lib/src/clixon_validate_minmax.c
index 80976701..3c52779e 100644
--- a/lib/src/clixon_validate_minmax.c
+++ b/lib/src/clixon_validate_minmax.c
@@ -82,7 +82,7 @@
 /*! New element last in list, check if already exists if sp return -1
  * @param[in]  vec   Vector of existing entries (new is last)
  * @param[in]  i1    The new entry is placed at vec[i1]
- * @param[in]  vlen  Lenght of entry
+ * @param[in]  vlen  Length of entry
  * @param[in]  sorted Sorted by system, ie sorted by key, otherwise no assumption
  * @retval     0     OK, entry is unique
  * @retval    -1     Duplicate detected
diff --git a/test/test_netconf_ssh_callhome.sh b/test/test_netconf_ssh_callhome.sh
index 9d916a0b..e25f87f4 100755
--- a/test/test_netconf_ssh_callhome.sh
+++ b/test/test_netconf_ssh_callhome.sh
@@ -31,8 +31,18 @@ keydir=$dir/keydir
 test -d $keydir || mkdir $keydir
 chmod 700 $keydir
 key=$keydir/mykey
-# XXX cant get it to work with this file under tmp dir so have to place it in homedir
-authfile=$HOME/.ssh/clixon_authorized_keys_removeme 
+
+# Cant get it to work with this file under tmp dir so have to place it in homedir
+if [ ! -d $HOME/.ssh ]; then
+    mkdir $HOME/.ssh
+    chmod 700 $HOME/.ssh
+fi
+authfile=$HOME/.ssh/clixon_authorized_keys_removeme
+
+# Not created in docker ubuntu-22.04
+if [ ! -d /run/sshd ]; then
+    mkdir /run/sshd
+fi
 
 cat <<EOF > $cfg
 <clixon-config xmlns="http://clicon.org/config">