forked from pool/systemd
d76216e1f9
(please also push to 13.1, I want the same version as F20) - Add 0001-gpt-auto-generator-exit-immediately-if-in-container.patch: don't start gpt auto-generator in container (git). - Add 0001-manager-when-verifying-whether-clients-may-change-en.patch: fix reload check in selinux case (git). - Add 0001-logind-fix-bus-introspection-data-for-TakeControl.patch: fix introspection for TakeControl (git). - Add 0001-mount-check-for-NULL-before-reading-pm-what.patch: fix crash when parsing some incorrect unit (git). - Add 0001-shared-util-fix-off-by-one-error-in-tag_to_udev_node.patch: Fix udev rules parsing (git). - Add 0001-systemd-serialize-deserialize-forbid_restart-value.patch: Fix incorrect deserialization for forbid_restart (git). - Add 0001-core-unify-the-way-we-denote-serialization-attribute.patch: Ensure forbid_restart is named like other attributes (git). - Add 0001-journald-fix-minor-memory-leak.patch: fix memleak in journald (git). - Add 0001-do-not-accept-garbage-from-acpi-firmware-performance.patch: Improve ACPI firmware performance parsing (git). - Add 0001-journald-remove-rotated-file-from-hashmap-when-rotat.patch: Fix journal rotation (git). - Add 0001-login-fix-invalid-free-in-sd_session_get_vt.patch: Fix memory corruption in sd_session_get_vt (git). OBS-URL: https://build.opensuse.org/request/show/203387 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=454
29 lines
925 B
Diff
29 lines
925 B
Diff
From a8ccacf5344c4434b1d5ff3837307acb8fcf93d2 Mon Sep 17 00:00:00 2001
|
|
From: Bastien Nocera <hadess@hadess.net>
|
|
Date: Mon, 14 Oct 2013 08:15:51 +0200
|
|
Subject: [PATCH] shared/util: Fix glob_extend() argument
|
|
|
|
glob_extend() would completely fail to work, or return incorrect
|
|
data if it wasn't being passed the current getopt "optarg" variable
|
|
as it used the global variable, instead of the passed parameters.
|
|
---
|
|
src/shared/util.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/src/shared/util.c b/src/shared/util.c
|
|
index 54dbace..1822770 100644
|
|
--- a/src/shared/util.c
|
|
+++ b/src/shared/util.c
|
|
@@ -4461,7 +4461,7 @@ int glob_extend(char ***strv, const char *path) {
|
|
char **p;
|
|
|
|
errno = 0;
|
|
- k = glob(optarg, GLOB_NOSORT|GLOB_BRACE, NULL, &g);
|
|
+ k = glob(path, GLOB_NOSORT|GLOB_BRACE, NULL, &g);
|
|
|
|
if (k == GLOB_NOMATCH)
|
|
return -ENOENT;
|
|
--
|
|
1.8.4
|
|
|