commit 59fac1eddbe427db0611b1b2c70503dc214a2260
author Michal Vasko <mvasko@cesnet.cz> Thu Jun 22 15:48:56 2017 +0200
committer Michal Vasko <mvasko@cesnet.cz> Thu Jun 22 15:48:56 2017 +0200
tree 4a592b290e9a10ecad1b811fde541d12655ffb59
parent 101c90ac3455d70075d585008b24d99d718b38e3

CHANGE lnc2 & libyang API changes

Fixes #5

src/netopeerguid.c

diff --git a/src/netopeerguid.c b/src/netopeerguid.c
index 98f7b38..83cb64b 100644
--- a/src/netopeerguid.c
+++ b/src/netopeerguid.c
@@ -136,14 +136,14 @@
 }
 
 int
-netconf_callback_ssh_hostkey_check(const char* UNUSED(hostname), ssh_session UNUSED(session))
+netconf_callback_ssh_hostkey_check(const char* UNUSED(hostname), ssh_session UNUSED(session), void *UNUSED(data))
 {
     /* always approve */
     return (EXIT_SUCCESS);
 }
 
 char *
-netconf_callback_sshauth_passphrase(const char *UNUSED(priv_key_file))
+netconf_callback_sshauth_passphrase(const char *UNUSED(priv_key_file), void *UNUSED(data))
 {
     char *buf;
     buf = strdup(password);
@@ -151,7 +151,7 @@
 }
 
 char *
-netconf_callback_sshauth_password(const char *UNUSED(username), const char *UNUSED(hostname))
+netconf_callback_sshauth_password(const char *UNUSED(username), const char *UNUSED(hostname), void *UNUSED(data))
 {
     char *buf;
     buf = strdup(password);
@@ -160,7 +160,7 @@
 
 char *
 netconf_callback_sshauth_interactive(const char *UNUSED(name), const char *UNUSED(instruction),
-                                     const char *UNUSED(prompt), int UNUSED(echo))
+                                     const char *UNUSED(prompt), int UNUSED(echo), void *UNUSED(data))
 {
     char *buf;
     buf = strdup(password);
@@ -216,7 +216,7 @@
     char *old_sid = NULL;
     const char *j_old_sid = NULL;
     char str_port[6];
-    const char **cpblts;
+    const char * const *cpblts;
     struct lyd_node *yanglib, *module, *node;
 
     if (s == NULL) {
@@ -447,6 +447,7 @@
 node_metadata_basic(struct lys_node *node, json_object *parent)
 {
     json_object *obj;
+    const struct lys_module *mod;
 
     /* description */
     node_metadata_text(node->dsc, "description", parent);
@@ -481,13 +482,17 @@
     json_object_object_add(parent, "mandatory", obj);
 
     /* NACM extensions */
-    if (node->nacm) {
-        if (node->nacm & LYS_NACM_DENYW) {
-            obj = json_object_new_string("default-deny-write");
-        } else {
-            obj = json_object_new_string("default-deny-all");
+    if (node->ext_size) {
+        mod = ly_ctx_get_module(node->module->ctx, "ietf-netconf-acm", NULL);
+        if (mod && (mod->extensions_size == 2)) {
+            if (lys_ext_instance_presence(&mod->extensions[0], node->ext, node->ext_size) > -1) {
+                obj = json_object_new_string(mod->extensions[0].name);
+                json_object_object_add(parent, "ext", obj);
+            } else if (lys_ext_instance_presence(&mod->extensions[1], node->ext, node->ext_size) > -1) {
+                obj = json_object_new_string(mod->extensions[1].name);
+                json_object_object_add(parent, "ext", obj);
+            }
         }
-        json_object_object_add(parent, "ext", obj);
     }
 }
 
@@ -3810,10 +3815,10 @@
     nc_client_init();
     nc_verbosity(NC_VERB_VERBOSE);
     nc_set_print_clb(clb_print);
-    nc_client_ssh_set_auth_hostkey_check_clb(netconf_callback_ssh_hostkey_check);
-    nc_client_ssh_set_auth_interactive_clb(netconf_callback_sshauth_interactive);
-    nc_client_ssh_set_auth_password_clb(netconf_callback_sshauth_password);
-    nc_client_ssh_set_auth_privkey_passphrase_clb(netconf_callback_sshauth_passphrase);
+    nc_client_ssh_set_auth_hostkey_check_clb(netconf_callback_ssh_hostkey_check, NULL);
+    nc_client_ssh_set_auth_interactive_clb(netconf_callback_sshauth_interactive, NULL);
+    nc_client_ssh_set_auth_password_clb(netconf_callback_sshauth_password, NULL);
+    nc_client_ssh_set_auth_privkey_passphrase_clb(netconf_callback_sshauth_passphrase, NULL);
 
     /* disable publickey authentication */
     nc_client_ssh_set_auth_pref(NC_SSH_AUTH_PUBLICKEY, -1);