|
 |
acd976 |
From 4ef597d15df246f4121266aaf3e291e3f06f6f4a Mon Sep 17 00:00:00 2001
|
|
|
acd976 |
From: Sumit Bose <sbose@redhat.com>
|
|
|
acd976 |
Date: Wed, 10 Mar 2021 17:57:07 +0100
|
|
|
acd976 |
Subject: [PATCH 1/2] build: add --with-vendor-error-message configure option
|
|
|
acd976 |
|
|
|
acd976 |
With the new configure option --with-vendor-error-message a packager or
|
|
|
acd976 |
a distribution can add a message if realmd returns with an error.
|
|
|
acd976 |
|
|
|
acd976 |
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1889386
|
|
|
acd976 |
---
|
|
|
acd976 |
configure.ac | 15 +++++++++++++++
|
|
|
acd976 |
tools/realm.c | 7 +++++++
|
|
|
acd976 |
2 files changed, 22 insertions(+)
|
|
|
acd976 |
|
|
|
acd976 |
diff --git a/configure.ac b/configure.ac
|
|
|
acd976 |
index ee067d9..05ec1bf 100644
|
|
|
acd976 |
--- a/configure.ac
|
|
|
acd976 |
+++ b/configure.ac
|
|
|
acd976 |
@@ -51,6 +51,21 @@ fi
|
|
|
acd976 |
|
|
|
acd976 |
AC_SUBST(DISTRO)
|
|
|
acd976 |
|
|
|
acd976 |
+# -----------------------------------------------------------------------------
|
|
|
acd976 |
+# Vendor error message
|
|
|
acd976 |
+
|
|
|
acd976 |
+AC_ARG_WITH([vendor-error-message],
|
|
|
acd976 |
+ [AS_HELP_STRING([--with-vendor-error-message=ARG],
|
|
|
acd976 |
+ [Add a vendor specific error message shown if a realm command fails]
|
|
|
acd976 |
+ )],
|
|
|
acd976 |
+ [AS_IF([test "x$withval" != "x"],
|
|
|
acd976 |
+ [AC_DEFINE_UNQUOTED([VENDOR_MSG],
|
|
|
acd976 |
+ ["$withval"],
|
|
|
acd976 |
+ [Vendor specific error message])],
|
|
|
acd976 |
+ [AC_MSG_ERROR([--with-vendor-error-message requires an argument])]
|
|
|
acd976 |
+ )],
|
|
|
acd976 |
+ [])
|
|
|
acd976 |
+
|
|
|
acd976 |
# -----------------------------------------------------------------------------
|
|
|
acd976 |
# Basic tools
|
|
|
acd976 |
|
|
|
acd976 |
diff --git a/tools/realm.c b/tools/realm.c
|
|
|
acd976 |
index 1530f09..8fdca16 100644
|
|
|
acd976 |
--- a/tools/realm.c
|
|
|
acd976 |
+++ b/tools/realm.c
|
|
|
acd976 |
@@ -287,6 +287,13 @@ main (int argc,
|
|
|
acd976 |
ret = (realm_commands[i].function) (client, argc, argv);
|
|
|
acd976 |
g_object_unref (client);
|
|
|
acd976 |
|
|
|
acd976 |
+#ifdef VENDOR_MSG
|
|
|
acd976 |
+ if (ret != 0) {
|
|
|
acd976 |
+ g_printerr (VENDOR_MSG"\n");
|
|
|
acd976 |
+ }
|
|
|
acd976 |
+
|
|
|
acd976 |
+#endif
|
|
|
acd976 |
+
|
|
|
acd976 |
break;
|
|
|
acd976 |
}
|
|
|
acd976 |
}
|
|
|
acd976 |
--
|
|
|
acd976 |
2.30.2
|
|
|
acd976 |
|