From 384ce70d7cde14324602c90786a461cc505085d2 Mon Sep 17 00:00:00 2001
From: Olof hagsand <olof@hagsand.se>
Date: Tue, 21 Sep 2021 13:24:34 +0200
Subject: [PATCH] memory leak and nacm recovery test fix

---
 apps/backend/backend_get.c | 2 ++
 test/test_nacm_recovery.sh | 5 +++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/apps/backend/backend_get.c b/apps/backend/backend_get.c
index c3770e16..595ceaac 100644
--- a/apps/backend/backend_get.c
+++ b/apps/backend/backend_get.c
@@ -863,6 +863,8 @@ get_common(clicon_handle        h,
     retval = 0;
  done:
     clicon_debug(1, "%s retval:%d", __FUNCTION__, retval);
+    if (xret)
+	xml_free(xret);
     if (cbreason)
 	cbuf_free(cbreason);
     if (nsc0)
diff --git a/test/test_nacm_recovery.sh b/test/test_nacm_recovery.sh
index c10228a7..58aa7a4b 100755
--- a/test/test_nacm_recovery.sh
+++ b/test/test_nacm_recovery.sh
@@ -121,7 +121,6 @@ EOF
     else
 	new "get startup not ok"
 	expecteof "$prefix$clixon_netconf -qf $cfg -U $pseudo" 0 "$DEFAULTHELLO<rpc $DEFAULTNS><get-config><source><candidate/></source></get-config></rpc>]]>]]>" "^<rpc-reply $DEFAULTNS><rpc-error><error-type>application</error-type><error-tag>access-denied</error-tag><error-severity>error</error-severity><error-message>User $realuser credential not matching NACM user $pseudo</error-message></rpc-error></rpc-reply>]]>]]>$"
-	return;
     fi
 	
     if $putp; then
@@ -132,7 +131,8 @@ EOF
 	expecteof "$prefix$clixon_netconf -qf $cfg -U $pseudo" 0 "$DEFAULTHELLO<rpc $DEFAULTNS><get-config><source><candidate/></source></get-config></rpc>]]>]]>" "^<rpc-reply $DEFAULTNS><data>$RULES</data></rpc-reply>]]>]]>$"
     else
 	new "put, expect fail"
-	expecteof "$prefix$clixon_netconf -qf $cfg -U $pseudo" 0 "$DEFAULTHELLO<rpc $DEFAULTNS><edit-config><target><candidate/></target><config>$RULES</config></edit-config></rpc>]]>]]>" "^<rpc-reply $DEFAULTNS><rpc-error><error-type>application</error-type><error-tag>access-denied</error-tag><error-severity>error</error-severity><error-message>default deny</error-message></rpc-error></rpc-reply>]]>]]>$"
+	expecteof "$prefix$clixon_netconf -qf $cfg -U $pseudo" 0 "$DEFAULTHELLO<rpc $DEFAULTNS><edit-config><target><candidate/></target><config>$RULES</config></edit-config></rpc>]]>]]>" "^<rpc-reply $DEFAULTNS><rpc-error><error-type>application</error-type><error-tag>access-denied</error-tag><error-severity>error</error-severity><error-message>"
+	# default deny</error-message></rpc-error></rpc-reply>]]>]]>$"
     fi
     if [ $RC -ne 0 ]; then
 	new "Kill restconf daemon"
@@ -227,6 +227,7 @@ RECOVERY=_recovery
 new "cred: $CRED realuser:$REALUSER pseudo:$PSEUDO recovery:$RECOVERY"
 testrun $CRED $REALUSER $PSEUDO $RECOVERY false false
 
+new "endtest"
 endtest
 
 # Set by restconf_config