*/
#define _GNU_SOURCE
-#define AFB_BINDING_PRAGMA_NO_VERBOSE_MACRO
#include <stdlib.h>
#include <stdio.h>
#include <sys/stat.h>
#include <sys/wait.h>
+#if !defined(NO_CALL_PERSONALITY)
+#include <sys/personality.h>
+#endif
+
#include <json-c/json.h>
#include <systemd/sd-daemon.h>
#include "afb-hook.h"
#include "sd-fds.h"
#include "afb-debug.h"
+#include "process-name.h"
/*
if SELF_PGROUP == 0 the launched command is the group leader
switch(*++it) {
case 'p': wr = stpcpy(wr, port); break;
case 't': wr = stpcpy(wr, token); break;
- default: *wr++ = SUBST_CHAR;
+ default: *wr++ = SUBST_CHAR; /*@fallthrough@*/
case SUBST_CHAR: *wr++ = *it;
}
arg = ++it;
{
struct sigaction siga;
char port[20];
+ const char *token;
int rc;
/* check whether a command is to execute or not */
}
else {
/* instanciate arguments and environment */
- if (instanciate_command_args(port, config->token) >= 0
- && instanciate_environ(port, config->token) >= 0) {
+ token = afb_session_initial_token();
+ if (instanciate_command_args(port, token) >= 0
+ && instanciate_environ(port, token) >= 0) {
/* run */
if (!SELF_PGROUP)
setpgid(0, 0);
/* load bindings */
afb_debug("start-load");
+ apiset_start_list(config->so_bindings, afb_api_so_add_binding, "the binding");
apiset_start_list(config->dbus_clients, afb_api_dbus_add_client, "the afb-dbus client");
apiset_start_list(config->ws_clients, afb_api_ws_add_client, "the afb-websocket client");
- apiset_start_list(config->ldpaths, afb_api_so_add_pathset, "the binding path set");
- apiset_start_list(config->so_bindings, afb_api_so_add_binding, "the binding");
+ apiset_start_list(config->ldpaths, afb_api_so_add_pathset_fails, "the binding path set");
+ apiset_start_list(config->weak_ldpaths, afb_api_so_add_pathset_nofails, "the weak binding path set");
apiset_start_list(config->dbus_servers, afb_api_dbus_add_server, "the afb-dbus service");
apiset_start_list(config->ws_servers, afb_api_ws_add_server, "the afb-websocket service");
/* start the services */
afb_debug("start-start");
+#if !defined(NO_CALL_PERSONALITY)
+ personality((unsigned long)-1L);
+#endif
if (afb_apiset_start_all_services(main_apiset, 1) < 0)
goto error;
// ------------- Build session handler & init config -------
config = afb_config_parse_arguments(argc, argv);
-
+ if (config->name) {
+ verbose_set_name(config->name, 0);
+ process_name_set_name(config->name);
+ process_name_replace_cmdline(argv, config->name);
+ }
afb_debug("main-args");
// --------- run -----------