47 lines
1.6 KiB
Diff
47 lines
1.6 KiB
Diff
From 6a2a4adfefd9c80884c6a5a565d2d781ba7227fb Mon Sep 17 00:00:00 2001
|
|
From: Laszlo Ersek <lersek@redhat.com>
|
|
Date: Wed, 11 May 2022 05:26:48 +0200
|
|
Subject: [PATCH] update common submodule
|
|
|
|
Laszlo Ersek (2):
|
|
mlcustomize: refresh generated files
|
|
remove non-generated "--selinux-relabel" options
|
|
|
|
Richard W.M. Jones (2):
|
|
options/uri.c: Fix missing word in error message
|
|
options/uri.c: Free variable on error path
|
|
|
|
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1554735
|
|
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2075718
|
|
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
|
|
(cherry picked from commit 08c4ac90f5a3c08b48444e2faf3d0f58d6ddc206)
|
|
---
|
|
common | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
Submodule common 0a231b3e6..48527b876:
|
|
diff --git a/common/options/uri.c b/common/options/uri.c
|
|
index 6b696fc2d..84d393c1e 100644
|
|
--- a/common/options/uri.c
|
|
+++ b/common/options/uri.c
|
|
@@ -135,7 +135,7 @@ parse (const char *arg, char **path_ret, char **protocol_ret,
|
|
socket = query_get (uri, "socket");
|
|
|
|
if (uri->server && STRNEQ (uri->server, "") && socket) {
|
|
- fprintf (stderr, _("%s: %s: cannot both a server name and a socket query parameter\n"),
|
|
+ fprintf (stderr, _("%s: %s: cannot have both a server name and a socket query parameter\n"),
|
|
getprogname (), arg);
|
|
return -1;
|
|
}
|
|
@@ -347,6 +347,7 @@ make_server (xmlURIPtr uri, const char *socket, char ***ret)
|
|
*ret = malloc (sizeof (char *) * 2);
|
|
if (*ret == NULL) {
|
|
perror ("malloc");
|
|
+ free (server);
|
|
return -1;
|
|
}
|
|
(*ret)[0] = server;
|
|
--
|
|
2.31.1
|
|
|