experiments/clixon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Typos and docker test fix for ubuntu-22.04

Browse source
This commit is contained in:
Olof hagsand 2022-11-09 16:39:00 +01:00
parent d5c657bde3
commit f82ce896a9
4 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -77,6 +77,7 @@ Developers may need to change their code
* Added three-value return. * Added three-value return.
* Code need to be changed from: checking for `<0` to `<1` to keep same semantics * Code need to be changed from: checking for `<0` to `<1` to keep same semantics
* Added `skiptop` parameter to `xml2json_vec()` * Added `skiptop` parameter to `xml2json_vec()`
* Added `xe` argument to `candidate_commit` for confirmed commit extra parameters
### Minor features ### Minor features

1
apps/backend/backend_commit.c
View file

@ -642,7 +642,6 @@ candidate_validate(clicon_handle h,
* do something more drastic? * do something more drastic?
* @param[in] h Clicon handle * @param[in] h Clicon handle
* @param[in] xe Request: <rpc><xn></rpc> (or NULL) * @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[in] db A candidate database, not necessarily "candidate"
* @param[out] cbret Return xml tree, eg <rpc-reply>..., <rpc-error.. * @param[out] cbret Return xml tree, eg <rpc-reply>..., <rpc-error..
* @retval -1 Error - or validation failed * @retval -1 Error - or validation failed

2
lib/src/clixon_validate_minmax.c
View file

@ -82,7 +82,7 @@
/*! New element last in list, check if already exists if sp return -1 /*! 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] vec Vector of existing entries (new is last)
* @param[in] i1 The new entry is placed at vec[i1] * @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 * @param[in] sorted Sorted by system, ie sorted by key, otherwise no assumption
* @retval 0 OK, entry is unique * @retval 0 OK, entry is unique
* @retval -1 Duplicate detected * @retval -1 Duplicate detected

14
test/test_netconf_ssh_callhome.sh
View file

@ -31,8 +31,18 @@ keydir=$dir/keydir
test -d $keydir || mkdir $keydir test -d $keydir || mkdir $keydir
chmod 700 $keydir chmod 700 $keydir
key=$keydir/mykey 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 cat <<EOF > $cfg
<clixon-config xmlns="http://clicon.org/config"> <clixon-config xmlns="http://clicon.org/config">