+2007-07-24 Havoc Pennington <hp@redhat.com>
+
+ * configure.in: add AM_PROG_CC_C_O to allow per-target CPPFLAGS
+
+ * bus/dispatch.c (bus_dispatch_test_conf): Fix up setting
+ TEST_LAUNCH_HELPER_CONFIG to include the full path, and enable
+ test shell_fail_service_auto_start when use_launcher==TRUE
+
+ * bus/activation-helper-bin.c (convert_error_to_exit_code): pass
+ through the INVALID_ARGS error so the test suite works
+
+ * bus/activation.c (handle_activation_exit_error): return
+ DBUS_ERROR_NO_MEMORY if we get BUS_SPAWN_EXIT_CODE_NO_MEMORY
+
+ * dbus/dbus-spawn.c (_dbus_babysitter_get_child_exit_status):
+ return only the exit code of the child, not the entire thingy from
+ waitpid(), and make the return value indicate whether the child
+ exited normally (with a status code)
+
+ * bus/bus.c (process_config_first_time_only): _dbus_strdup works
+ on NULL so no need to check
+ (process_config_every_time): move servicehelper init here, so we
+ reload it on HUP or config file change
+
+ * bus/Makefile.am (install-data-hook): remove comment because
+ Emacs make mode seems to be grumpy about it
+
2007-07-24 Richard Hughes <richard@hughsie.com>
* bus/Makefile.am:
$(mkinstalldirs) $(DESTDIR)$(datadir)/dbus-1/system-services
$(mkinstalldirs) $(DESTDIR)$(libexecdir)/dbus-1
$(INSTALL_PROGRAM) dbus-daemon-launch-helper $(DESTDIR)$(libexecdir)
- ## This is SETUID! <insert suitable warning here...>
if test `id -u` -eq 0; then \
chown root:$(DBUS_USER) $(DESTDIR)$(libexecdir)/dbus-daemon-launch-helper; \
chmod 4750 $(DESTDIR)$(libexecdir)/dbus-daemon-launch-helper; \
#define BUS_SPAWN_EXIT_CODE_PERMISSIONS_INVALID 6
#define BUS_SPAWN_EXIT_CODE_FILE_INVALID 7
#define BUS_SPAWN_EXIT_CODE_EXEC_FAILED 8
+#define BUS_SPAWN_EXIT_CODE_INVALID_ARGS 9
#endif /* BUS_ACTIVATION_EXIT_CODES_H */
if (dbus_error_has_name (error, DBUS_ERROR_SPAWN_EXEC_FAILED))
return BUS_SPAWN_EXIT_CODE_EXEC_FAILED;
+ if (dbus_error_has_name (error, DBUS_ERROR_INVALID_ARGS))
+ return BUS_SPAWN_EXIT_CODE_INVALID_ARGS;
+
/* should we assert? */
+ fprintf(stderr, "%s: %s\n", error->name, error->message);
+
return BUS_SPAWN_EXIT_CODE_SETUP_FAILED;
}
* Depending on the exit code of the helper, set the error accordingly
*/
static void
-handle_activation_exit_error (int exit_code, DBusError *error)
+handle_activation_exit_error (int exit_code,
+ DBusError *error)
{
switch (exit_code)
{
case BUS_SPAWN_EXIT_CODE_NO_MEMORY:
- dbus_set_error (error, DBUS_ERROR_SPAWN_SETUP_FAILED,
- "Launcher could not run as out of memory");
+ dbus_set_error (error, DBUS_ERROR_NO_MEMORY,
+ "Launcher could not run (out of memory)");
break;
case BUS_SPAWN_EXIT_CODE_SETUP_FAILED:
dbus_set_error (error, DBUS_ERROR_SPAWN_SETUP_FAILED,
dbus_set_error (error, DBUS_ERROR_SPAWN_EXEC_FAILED,
"Cannot launch daemon, file not found or permissions invalid");
break;
+ case BUS_SPAWN_EXIT_CODE_INVALID_ARGS:
+ dbus_set_error (error, DBUS_ERROR_INVALID_ARGS,
+ "Invalid arguments to command line");
+ break;
default:
dbus_set_error (error, DBUS_ERROR_SPAWN_CHILD_EXITED,
"Launch helper exited with unknown return code %i", exit_code);
}
/* This code only gets executed the first time the
- config files are parsed. It is not executed
- when config files are reloaded.*/
+ * config files are parsed. It is not executed
+ * when config files are reloaded.
+ */
static dbus_bool_t
process_config_first_time_only (BusContext *context,
BusConfigParser *parser,
{
DBusList *link;
DBusList **addresses;
- const char *user, *pidfile, *servicehelper;
+ const char *user, *pidfile;
char **auth_mechanisms;
DBusList **auth_mechanisms_list;
int len;
/* keep around the pid filename so we can delete it later */
context->pidfile = _dbus_strdup (pidfile);
- /* we need to configure this so we can test the service helper */
- servicehelper = bus_config_parser_get_servicehelper (parser);
- if (servicehelper != NULL)
- context->servicehelper = _dbus_strdup (servicehelper);
-
/* Build an array of auth mechanisms */
auth_mechanisms_list = bus_config_parser_get_mechanisms (parser);
}
/* This code gets executed every time the config files
- are parsed: both during BusContext construction
- and on reloads. */
+ * are parsed: both during BusContext construction
+ * and on reloads. This function is slightly screwy
+ * since it can do a "half reload" in out-of-memory
+ * situations. Realistically, unlikely to ever matter.
+ */
static dbus_bool_t
process_config_every_time (BusContext *context,
BusConfigParser *parser,
DBusList **dirs;
BusActivation *new_activation;
char *addr;
-
+ const char *servicehelper;
+ char *s;
+
dbus_bool_t retval;
_DBUS_ASSERT_ERROR_IS_CLEAR (error);
/* get the service directories */
dirs = bus_config_parser_get_service_dirs (parser);
+ /* and the service helper */
+ servicehelper = bus_config_parser_get_servicehelper (parser);
+
+ s = _dbus_strdup(servicehelper);
+ if (s == NULL && servicehelper != NULL)
+ {
+ BUS_SET_OOM (error);
+ goto failed;
+ }
+ else
+ {
+ dbus_free(context->servicehelper);
+ context->servicehelper = s;
+ }
+
/* Create activation subsystem */
new_activation = bus_activation_new (context, &full_address,
dirs, error);
{
const char *filename_str;
char *servicehelper;
- filename_str = _dbus_string_get_const_data (filename);
- /* check if helper exists... */
- if (!_dbus_file_exists (filename_str))
- {
- dbus_set_error (error, DBUS_ERROR_FILE_NOT_FOUND,
- "setuid helper '%s'not found", filename_str);
- return FALSE;
- }
+ filename_str = _dbus_string_get_const_data (filename);
/* copy to avoid overwriting with NULL on OOM */
servicehelper = _dbus_strdup (filename_str);
dbus_free (parser->servicehelper);
parser->servicehelper = servicehelper;
+ /* We don't check whether the helper exists; instead we
+ * would just fail to ever activate anything if it doesn't.
+ * This allows an admin to fix the problem if it doesn't exist.
+ * It also allows the parser test suite to successfully parse
+ * test cases without installing the helper. ;-)
+ */
+
return TRUE;
}
}
}
+static dbus_bool_t
+setenv_TEST_LAUNCH_HELPER_CONFIG(const DBusString *test_data_dir,
+ const char *filename)
+{
+ DBusString full;
+ DBusString file;
+
+ if (!_dbus_string_init (&full))
+ return FALSE;
+
+ if (!_dbus_string_copy (test_data_dir, 0, &full, 0))
+ {
+ _dbus_string_free (&full);
+ return FALSE;
+ }
+
+ _dbus_string_init_const (&file, filename);
+
+ if (!_dbus_concat_dir_and_file (&full, &file))
+ {
+ _dbus_string_free (&full);
+ return FALSE;
+ }
+
+ _dbus_verbose ("Setting TEST_LAUNCH_HELPER_CONFIG to '%s'\n",
+ _dbus_string_get_const_data (&full));
+
+ _dbus_setenv ("TEST_LAUNCH_HELPER_CONFIG", _dbus_string_get_const_data (&full));
+
+ _dbus_string_free (&full);
+
+ return TRUE;
+}
+
static dbus_bool_t
bus_dispatch_test_conf (const DBusString *test_data_dir,
const char *filename,
DBusError error;
/* save the config name for the activation helper */
- _dbus_setenv ("TEST_LAUNCH_HELPER_CONFIG", filename);
+ if (!setenv_TEST_LAUNCH_HELPER_CONFIG (test_data_dir, filename))
+ _dbus_assert_not_reached ("no memory setting TEST_LAUNCH_HELPER_CONFIG");
dbus_error_init (&error);
#endif
/* only do the shell fail test if we are not using the launcher */
- if (!use_launcher)
- check2_try_iterations (context, foo, "shell_fail_service_auto_start",
- check_shell_fail_service_auto_start);
+ check2_try_iterations (context, foo, "shell_fail_service_auto_start",
+ check_shell_fail_service_auto_start);
/* specific to launcher */
if (use_launcher)
DBusError error;
/* save the config name for the activation helper */
- _dbus_setenv ("TEST_LAUNCH_HELPER_CONFIG", filename);
-
+ if (!setenv_TEST_LAUNCH_HELPER_CONFIG (test_data_dir, filename))
+ _dbus_assert_not_reached ("no memory setting TEST_LAUNCH_HELPER_CONFIG");
+
dbus_error_init (&error);
context = bus_context_new_test (test_data_dir, filename);
AC_PROG_CC
+AM_PROG_CC_C_O
AC_PROG_CXX
AC_ISC_POSIX
AC_HEADER_STDC
{
sitter->have_child_status = TRUE;
sitter->status = arg;
- sitter->errnum = WEXITSTATUS (sitter->status);
+ sitter->errnum = 0;
_dbus_verbose ("recorded child status exited = %d signaled = %d exitstatus = %d termsig = %d\n",
WIFEXITED (sitter->status), WIFSIGNALED (sitter->status),
WEXITSTATUS (sitter->status), WTERMSIG (sitter->status));
}
/**
- * Gets the exit status of the child. We do this so implimentation specific
- * detail is not cluttering up dbus, for example the system laucher code.
+ * Gets the exit status of the child. We do this so implementation specific
+ * detail is not cluttering up dbus, for example the system launcher code.
+ * This can only be called if the child has exited, i.e. call
+ * _dbus_babysitter_get_child_exited(). It returns FALSE if the child
+ * did not return a status code, e.g. because the child was signaled
+ * or we failed to ever launch the child in the first place.
*
* @param sitter the babysitter
* @param status the returned status code
* @returns #FALSE on failure
*/
dbus_bool_t
-_dbus_babysitter_get_child_exit_status (DBusBabysitter *sitter, int *status)
+_dbus_babysitter_get_child_exit_status (DBusBabysitter *sitter,
+ int *status)
{
if (!_dbus_babysitter_get_child_exited (sitter))
_dbus_assert_not_reached ("Child has not exited");
+
+ if (!sitter->have_child_status ||
+ !(WIFEXITED (sitter->status)))
+ return FALSE;
- if (sitter->errnum != WEXITSTATUS (sitter->status))
- _dbus_assert_not_reached ("Status is not exit!");
-
- if (!sitter->have_child_status)
- _dbus_assert_not_reached ("Not a child!");
-
- *status = sitter->status;
+ *status = WEXITSTATUS (sitter->status);
return TRUE;
}
projects / thirdparty / dbus.git / commitdiff
