experiments/clixon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed: SEGV when starting FCGI restconf program

Browse source 
- Reverted removal of CLICON_RESTCONF_PATH since it was used there
Misc fixes: initialized variables, docs, removed obsolete --enable-optyang
This commit is contained in:
Olof hagsand 2021-12-30 15:57:43 +01:00
parent 3117332ddd
commit 1808015cf6
8 changed files with 36 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

13
apps/restconf/restconf_main_fcgi.c
View file

@ -211,7 +211,7 @@ main(int argc,
FCGX_Request request;
FCGX_Request *req = &request;
int c;
char *sockpath;
char *sockpath = NULL;
char *path;
clicon_handle h;
char *dir;
@ -523,6 +523,17 @@ main(int argc,
clicon_err(OE_DAEMON, EFAULT, "Restconf daemon config not found or disabled");
goto done;
}
/* XXX see restconf_config_init access directly */
if ((sockpath = clicon_option_str(h, "CLICON_RESTCONF_PATH")) == NULL){
clicon_err(OE_CFG, errno, "No CLICON_RESTCONF_PATH in clixon configure file");
goto done;
}
/* XXX CLICON_RESTCONF_PATH is marked as obsolete and should use
* fcgi-socket in clixon-restconf.yang instead */
if ((sockpath = clicon_option_str(h, "CLICON_RESTCONF_PATH")) == NULL){
clicon_err(OE_CFG, errno, "No CLICON_RESTCONF_PATH in clixon configure file");
goto done;
}
if (FCGX_Init() != 0){ /* How to cleanup memory after this? */
clicon_err(OE_CFG, errno, "FCGX_Init");
goto done;