* Support for YANG conditionals "must" and "when" according to RFC 7950 Sec 7.5.3 and 7.21.5

* XPATH checked at validation time

apps/backend/backend_client.c

@@ -986,10 +986,10 @@ nacm_access(clicon_handle h,
 	goto step10;
     /* User's group */
     if (xpath_vec(xacm,
-#ifdef XPATH_USE_NEW
-		  "groups/group[user-name='%s']",
-#else
+#ifdef COMPAT_XSL
 		  "groups/group[user-name=%s]",
+#else
+		  "groups/group[user-name='%s']",
 #endif
 		  &gvec, &glen, username) < 0)
 	goto done;
@@ -1009,10 +1009,10 @@ nacm_access(clicon_handle h,
 	    char *gname;
 	    gname = xml_find_body(gvec[j], "name");
 	    if (xpath_first(xrlist,
-#ifdef XPATH_USE_NEW
-			    ".[group='%s']",
-#else
+#ifdef COMPAT_XSL
 			    ".[group=%s]",
+#else
+			    ".[group='%s']",
 #endif
 			    gname)!=NULL)
 		break; /* found */

apps/cli/cli_common.c

@@ -1249,7 +1249,7 @@ cli_copy_config(clicon_handle h,
     for (i=0; i<strlen(xpath); i++){
 	if (xpath[i] == '%')
 	    j++;
-#ifndef XPATH_USE_NEW
+#ifdef COMPAT_XSL
 	/* This is a horrible kludge due to:
 	 * (1) old xpath implementation wrongly did: a[b=x] instead of a[b='x']
 	 * (2) cli_copy_config has as 2nd argument such an xpath provided by user.