* Added -U <user> command line to clixon_cli and clixon_netconf for NACM pseudo-user tests

lib/src/clixon_proto_client.c

@@ -91,6 +91,9 @@ clicon_rpc_msg(clicon_handle      h,
     cxobj             *xret = NULL;
     yang_spec         *yspec;
 
+#ifdef RPC_USERNAME_ASSERT
+    assert(strstr(msg->op_body, "username")!=NULL); /* XXX */
+#endif
     clicon_debug(1, "%s request:%s", __FUNCTION__, msg->op_body);
     if ((sock = clicon_sock(h)) == NULL){
 	clicon_err(OE_FATAL, 0, "CLICON_SOCK option not set");

lib/src/clixon_xml_map.c

@@ -1779,7 +1779,7 @@ xml_merge1(cxobj              *x0,
  * @param[in]  x0    Base xml tree (can be NULL in add scenarios)
  * @param[in]  x1    xml tree which modifies base
  * @param[in]  yspec Yang spec
- * @param[out] reason If retval=0 a malloced string. Needs to be freed by caller
+ * @param[out] reason If retval=0, reason is set. Malloced. Needs to be freed by caller
  * @retval     0     OK. If reason is set, Yang error
  * @retval    -1     Error
  * @note both x0 and x1 need to be top-level trees