diff options
| -rwxr-xr-x | semaphoreci/semaphore-runner.sh | 2 | ||||
| -rw-r--r-- | src/core/manager.c | 5 | ||||
| -rw-r--r-- | src/core/selinux-setup.c | 3 | ||||
| -rw-r--r-- | src/test/test-ordered-set.c | 22 |
4 files changed, 27 insertions, 5 deletions
diff --git a/semaphoreci/semaphore-runner.sh b/semaphoreci/semaphore-runner.sh index 897b398df9..abffb20588 100755 --- a/semaphoreci/semaphore-runner.sh +++ b/semaphoreci/semaphore-runner.sh @@ -4,7 +4,7 @@ set -eux # default to Debian testing DISTRO=${DISTRO:-debian} -RELEASE=${RELEASE:-buster} +RELEASE=${RELEASE:-bullseye} BRANCH=${BRANCH:-upstream-ci} ARCH=${ARCH:-amd64} CONTAINER=${RELEASE}-${ARCH} diff --git a/src/core/manager.c b/src/core/manager.c index 54c6321870..41e0d73736 100644 --- a/src/core/manager.c +++ b/src/core/manager.c @@ -589,6 +589,8 @@ static char** sanitize_environment(char **l) { /* Let's remove some environment variables that we need ourselves to communicate with our clients */ strv_env_unset_many( l, + "CACHE_DIRECTORY", + "CONFIGURATION_DIRECTORY", "EXIT_CODE", "EXIT_STATUS", "INVOCATION_ID", @@ -596,13 +598,16 @@ static char** sanitize_environment(char **l) { "LISTEN_FDNAMES", "LISTEN_FDS", "LISTEN_PID", + "LOGS_DIRECTORY", "MAINPID", "MANAGERPID", "NOTIFY_SOCKET", "PIDFILE", "REMOTE_ADDR", "REMOTE_PORT", + "RUNTIME_DIRECTORY", "SERVICE_RESULT", + "STATE_DIRECTORY", "WATCHDOG_PID", "WATCHDOG_USEC", NULL); diff --git a/src/core/selinux-setup.c b/src/core/selinux-setup.c index b8a94a52ab..817069b3fe 100644 --- a/src/core/selinux-setup.c +++ b/src/core/selinux-setup.c @@ -50,7 +50,8 @@ int mac_selinux_setup(bool *loaded_policy) { /* Already initialized by somebody else? */ r = getcon_raw(&con); - if (r == 0) { + /* getcon_raw can return 0, and still give us a NULL pointer. */ + if (r == 0 && con) { initialized = !streq(con, "kernel"); freecon(con); } diff --git a/src/test/test-ordered-set.c b/src/test/test-ordered-set.c index 0d29fcfad2..268c54fccc 100644 --- a/src/test/test-ordered-set.c +++ b/src/test/test-ordered-set.c @@ -7,6 +7,8 @@ #include "strv.h" static void test_set_steal_first(void) { + log_info("/* %s */", __func__); + _cleanup_ordered_set_free_ OrderedSet *m = NULL; int seen[3] = {}; char *val; @@ -42,12 +44,18 @@ DEFINE_PRIVATE_HASH_OPS_WITH_VALUE_DESTRUCTOR(item_hash_ops, void, trivial_hash_ static void test_set_free_with_hash_ops(void) { OrderedSet *m; struct Item items[4] = {}; - unsigned i; + + log_info("/* %s */", __func__); assert_se(m = ordered_set_new(&item_hash_ops)); - for (i = 0; i < ELEMENTSOF(items) - 1; i++) + + for (size_t i = 0; i < ELEMENTSOF(items) - 1; i++) assert_se(ordered_set_put(m, items + i) == 1); + for (size_t i = 0; i < ELEMENTSOF(items) - 1; i++) + assert_se(ordered_set_put(m, items + i) == 0); /* We get 0 here, because we use trivial hash + * ops. Also see below... */ + m = ordered_set_free(m); assert_se(items[0].seen == 1); assert_se(items[1].seen == 1); @@ -57,7 +65,9 @@ static void test_set_free_with_hash_ops(void) { static void test_set_put(void) { _cleanup_ordered_set_free_ OrderedSet *m = NULL; - _cleanup_free_ char **t = NULL; + _cleanup_free_ char **t = NULL, *str = NULL; + + log_info("/* %s */", __func__); m = ordered_set_new(&string_hash_ops); assert_se(m); @@ -71,6 +81,10 @@ static void test_set_put(void) { assert_se(ordered_set_put(m, (void*) "333") == 0); assert_se(ordered_set_put(m, (void*) "22") == 0); + assert_se(str = strdup("333")); + assert_se(ordered_set_put(m, str) == -EEXIST); /* ... and we get -EEXIST here, because we use + * non-trivial hash ops. */ + assert_se(t = ordered_set_get_strv(m)); assert_se(streq(t[0], "1")); assert_se(streq(t[1], "22")); @@ -86,6 +100,8 @@ static void test_set_put_string_set(void) { _cleanup_free_ char **final = NULL; /* "just free" because the strings are in the set */ void *t; + log_info("/* %s */", __func__); + m = ordered_set_new(&string_hash_ops); assert_se(m); |