From 447b8eb1d39af50729dfdeee63859766569c3958 Mon Sep 17 00:00:00 2001
From: Olof hagsand <olof@hagsand.se>
Date: Tue, 25 Apr 2023 16:22:25 +0200
Subject: [PATCH] test fix breaking actions. Minor doc changes

---
 CHANGELOG.md                 |  5 ++++-
 apps/netconf/netconf_main.c  |  2 +-
 include/clixon_custom.h      | 10 ++++------
 test/test_xpath_canonical.sh | 10 +++++-----
 4 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7976517f..5041aab3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -73,6 +73,9 @@ Developers may need to change their code
 	
 ### Minor features
 
+* Removed previous backward compatible compile-time options introduced in 6.0:
+  * NETCONF_DEFAULT_RETRIEVAL_REPORT_AL
+  * AUTOCLI_OBSOLETE_SKIP
 * Unified netconf input function
   * Three different implementations were used in external, internal and controller code
   * The new clixon_netconf_input API unifies all three uses
@@ -90,7 +93,7 @@ Developers may need to change their code
 ### Corrected Bugs
 
 * Fixed RESTCONF race conditions on SSL_shutdown sslerr ZERO_RETURN appears occasionally and exist.
-*  Fixed: RESTCONF: some client cert failure leads to restconf exit. Instead close and continue
+* Fixed: RESTCONF: some client cert failure leads to restconf exit. Instead close and continue
 
 ## 6.1.0
 19 Feb 2023
diff --git a/apps/netconf/netconf_main.c b/apps/netconf/netconf_main.c
index 18ff90ea..39172bbf 100644
--- a/apps/netconf/netconf_main.c
+++ b/apps/netconf/netconf_main.c
@@ -546,7 +546,7 @@ netconf_input_cb(int   s,
     int            i32;
     int            eom = 0;
     int            eof = 0;
-    int            framing_type;
+    netconf_framing_type framing_type;
     cxobj         *xtop = NULL;
     cxobj         *xreq;
     cxobj         *xerr = NULL;
diff --git a/include/clixon_custom.h b/include/clixon_custom.h
index 0b7f1617..134f2a70 100644
--- a/include/clixon_custom.h
+++ b/include/clixon_custom.h
@@ -189,16 +189,12 @@
  * This may lead to changes in behavior for clients retrieving configs without an explicit
  * <with-defaults> parameter.
  * To keep the previous behavior (as in 6.0) set this option with #define
+ * Introduced in 6.1, remove in 6.3
  */
 #undef NETCONF_DEFAULT_RETRIEVAL_REPORT_ALL
 
-/*! Temporary backward-compatible option for not generating CLI for obsolete YANG
- * Introduced in 6.1, remove in 6.2
- */
-#define AUTOCLI_OBSOLETE_SKIP
-
 /*! Temporary backward-compatible option for hiding CLI for deprecated YANG
- * Introduced in 6.1, remove in 6.2
+ * Introduced in 6.1, remove in 6.3
  */
 #define AUTOCLI_DEPRECATED_HIDE
 
@@ -214,9 +210,11 @@
  * - controller device control
  */
 /*! Use unified netconf input function for external use
+ * Introduced in 6.2
  */
 #define NETCONF_INPUT_UNIFIED_EXTERN
 
 /*! Use unified netconf input function for internal use
+ * Introduced in 6.2
  */
 #undef NETCONF_INPUT_UNIFIED_INTERNAL
diff --git a/test/test_xpath_canonical.sh b/test/test_xpath_canonical.sh
index 81fbae58..f800a534 100755
--- a/test/test_xpath_canonical.sh
+++ b/test/test_xpath_canonical.sh
@@ -56,14 +56,14 @@ expectpart "$($clixon_util_xpath -c -y $ydir -p "/i:x[.='42']" -n i:urn:example:
 new "xpath canonical form descendants"
 expectpart "$($clixon_util_xpath -c -y $ydir -p "//x[.='42']" -n null:urn:example:a -n j:urn:example:b)" 0 "//a:x\[.='42'\]" '0 : a = "urn:example:a"'
 
+new "xpath canonical form (no default should fail)"
+expectpart "$($clixon_util_xpath -c -y $ydir -p /x/j:y -n i:urn:example:a -n j:urn:example:b 2>&1)" 0 "/x/j:y: No namespace found for prefix"
+
 if false; then
 # No, with mointpoints I cant fail unknown prefix, see comment in xpath2canonical
-    new "xpath canonical form (no default should fail)"
-    expectpart "$($clixon_util_xpath -c -y $ydir -p /x/j:y -n i:urn:example:a -n j:urn:example:b 2>&1)" 0 "/x/j:y: No namespace found for prefix"
+    new "xpath canonical form (wrong namespace should fail)"
+    expectpart "$($clixon_util_xpath -c -y $ydir -p /i:x/j:y -n i:urn:example:c -n j:urn:example:b 2>&1)" 0 "/i:x/j:y: No yang found for namespace"
 fi
-new "xpath canonical form (wrong namespace should fail)"
-expectpart "$($clixon_util_xpath -c -y $ydir -p /i:x/j:y -n i:urn:example:c -n j:urn:example:b 2>&1)" 0 "/i:x/j:y: No yang found for namespace"
-
 rm -rf $dir
 
 new "endtest"