3ade29ac96
No important new functionality - Changes to ./configure command to remove warnings - 8 more patches from upstream 'git' to fix non-trivial bugs including on CVE. OBS-URL: https://build.opensuse.org/package/show/Base:System/nfs-utils?expand=0&rev=87
46 lines
1.5 KiB
Diff
46 lines
1.5 KiB
Diff
From a402f768db1dc6497cf7f592b33e142936897de2 Mon Sep 17 00:00:00 2001
|
|
From: Maximilian Wilhelm <max@rfc2324.org>
|
|
Date: Mon, 1 Jul 2013 11:58:13 -0400
|
|
Subject: [PATCH] Fix handling of preferred realm command line option.
|
|
|
|
The current implementation ignores any preferred realm specified on the
|
|
command line. Fix this behaviour and make sure the preferred realm is
|
|
used as first realm when trying to acquire a keytab entry
|
|
|
|
Signed-off-by: Maximilian Wilhelm <max@rfc2324.org>
|
|
Signed-off-by: Frederik Moellers <frederik.moellers@upb.de>
|
|
Signed-off-by: Steve Dickson <steved@redhat.com>
|
|
---
|
|
utils/gssd/krb5_util.c | 12 ++++++++++--
|
|
1 file changed, 10 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/utils/gssd/krb5_util.c b/utils/gssd/krb5_util.c
|
|
index 9ef80f0..abebdcd 100644
|
|
--- a/utils/gssd/krb5_util.c
|
|
+++ b/utils/gssd/krb5_util.c
|
|
@@ -852,11 +852,19 @@ find_keytab_entry(krb5_context context, krb5_keytab kt, const char *tgtname,
|
|
}
|
|
|
|
/*
|
|
- * Try the "appropriate" realm first, and if nothing found for that
|
|
- * realm, try the default realm (if it hasn't already been tried).
|
|
+ * Make sure the preferred_realm, which may have been explicitly set
|
|
+ * on the command line, is tried first. If nothing is found go on with
|
|
+ * the host and local default realm (if that hasn't already been tried).
|
|
*/
|
|
i = 0;
|
|
realm = realmnames[i];
|
|
+
|
|
+ if (strcmp (realm, preferred_realm) != 0) {
|
|
+ realm = preferred_realm;
|
|
+ /* resetting the realmnames index */
|
|
+ i = -1;
|
|
+ }
|
|
+
|
|
while (1) {
|
|
if (realm == NULL) {
|
|
tried_all = 1;
|
|
--
|
|
1.8.3.1.487.g3e7a5b4
|
|
|