diff --git a/apps/backend/backend_plugin_restconf.c b/apps/backend/backend_plugin_restconf.c index 18db73c8..bca32945 100644 --- a/apps/backend/backend_plugin_restconf.c +++ b/apps/backend/backend_plugin_restconf.c @@ -161,26 +161,6 @@ restconf_pseudo_set_inline(clixon_handle h, for (i=0; i i+1 && argv[i+1]){ - if ((cb = cbuf_new()) == NULL){ - clixon_err(OE_XML, errno, "cbuf_new"); - goto done; - } - if (clixon_xml2cbuf(cb, xrestconf, 0, 0, NULL, -1, 0) < 0) - goto done; - if ((str = strdup(cbuf_get(cb))) == NULL){ - clixon_err(OE_XML, errno, "stdup"); - goto done; - } - clixon_debug(CLIXON_DBG_BACKEND, "str:%s", str); - if (argv[i+1]) - free(argv[i+1]); - argv[i+1] = str; - break; - } -#endif } retval = 0; done: @@ -267,9 +247,6 @@ restconf_pseudo_process_control(clixon_handle h) int found = 0; nr = 8; /* pgm -f -D -l NULL */ -#ifdef RESTCONF_INLINE - nr += 2; -#endif if (clicon_option_str(h, "CLICON_CONFIGDIR")) nr += 2; if ((argv = calloc(nr, sizeof(char *))) == NULL){ @@ -329,10 +306,6 @@ restconf_pseudo_process_control(clixon_handle h) argv[i++] = "0"; argv[i++] = "-l"; argv[i++] = "s"; /* There is also log-destination in clixon-restconf.yang */ -#ifdef RESTCONF_INLINE - argv[i++] = "-R"; - argv[i++] = ""; /* The content is set in restconf_pseudo_set_inline */ -#endif argv[i++] = NULL; assert(i==nr); if (clixon_process_register(h, RESTCONF_PROCESS, diff --git a/include/clixon_custom.h b/include/clixon_custom.h index bd978ac8..0addc0ff 100644 --- a/include/clixon_custom.h +++ b/include/clixon_custom.h @@ -174,16 +174,6 @@ */ #define YANG_GROUPING_AUGMENT_SKIP -/*! Start of restconf from backend (when CLICON_BACKEND_RESTCONF_PROCESS=true) using -R - * - * If set, send initial restconf config via -R parameter at fork/exec. - * Seems to be only an optimization since the config is queried from the backend anyway - * The reason this probably should be undef:ed is that the restconf config appears in ps and other in - * cleartext - * Plan is to remove this (undef:d) in next release - */ -#undef RESTCONF_INLINE - /*! Use SHA256 (32 bytes) instead of SHA1 (20 bytes) * * Digest use is not cryptographic use, so SHA1 is enough for now