Instead of writing --ldpaths=/dev/null simply use
the option --no-ldpaths
Change-Id: Ia278989b90a079d998ba0cbb7a6bb78c46d58090
Signed-off-by: José Bollo <jose.bollo@iot.bzh>
#define SET_APITIMEOUT 14
#define SET_CNTXTIMEOUT 15
#define SET_WEAK_LDPATH 16
#define SET_APITIMEOUT 14
#define SET_CNTXTIMEOUT 15
#define SET_WEAK_LDPATH 16
{SET_LDPATH, 1, "ldpaths", "Load bindings from dir1:dir2:... [default = " BINDING_INSTALL_DIR "]"},
{SO_BINDING, 1, "binding", "Load the binding of path"},
{SET_LDPATH, 1, "ldpaths", "Load bindings from dir1:dir2:... [default = " BINDING_INSTALL_DIR "]"},
{SO_BINDING, 1, "binding", "Load the binding of path"},
- {SET_WEAK_LDPATH, 1, "weak-ldpaths","Same as --ldpaths but ignore erros"},
+ {SET_WEAK_LDPATH, 1, "weak-ldpaths","Same as --ldpaths but ignore errors"},
+ {NO_LDPATH, 0, "no-ldpaths", "Discard default ldpaths loading"},
{SET_AUTH_TOKEN, 1, "token", "Initial Secret [default=no-session, --token= for session without authentication]"},
{SET_RNDTOKEN, 0, "random-token","Creates a random token"},
{SET_AUTH_TOKEN, 1, "token", "Initial Secret [default=no-session, --token= for session without authentication]"},
{SET_RNDTOKEN, 0, "random-token","Creates a random token"},
list_add(&config->weak_ldpaths, argvalstr(optc));
break;
list_add(&config->weak_ldpaths, argvalstr(optc));
break;
+ case NO_LDPATH:
+ noarg(optc);
+ config->no_ldpaths = 1;
+ break;
+
case ADD_CALL:
list_add(&config->calls, argvalstr(optc));
break;
case ADD_CALL:
list_add(&config->calls, argvalstr(optc));
break;
if (config->rootapi == NULL)
config->rootapi = "/api";
if (config->rootapi == NULL)
config->rootapi = "/api";
- if (config->ldpaths == NULL && config->weak_ldpaths == NULL)
+ if (config->ldpaths == NULL && config->weak_ldpaths == NULL && !config->no_ldpaths)
list_add(&config->ldpaths, BINDING_INSTALL_DIR);
// if no config dir create a default path from uploaddir
list_add(&config->ldpaths, BINDING_INSTALL_DIR);
// if no config dir create a default path from uploaddir
int tracesvc;
int traceevt;
int noHttpd;
int tracesvc;
int traceevt;
int noHttpd;
+ int no_ldpaths; /* disable default ldpaths */
};
extern struct afb_config *afb_config_parse_arguments(int argc, char **argv);
};
extern struct afb_config *afb_config_parse_arguments(int argc, char **argv);